Changeset 1021 for trunk/bp-core/bp-core-catchuri.php

Timestamp:

02/06/2009 03:07:48 AM (17 years ago)

Author:

apeatling

Message:

Converted $bp as an array to $bp as an object. See this post for more info: http://buddypress.org/forums/topic.php?id=1125

File:

• trunk/bp-core/bp-core-catchuri.php (modified) (9 diffs)

trunk/bp-core/bp-core-catchuri.php

@@ -15 +15 @@
  *
  * The URI's are broken down as follows:
- *   - http:// example.com / members / andy / [current_component] / [current_action] / [action_variables] / [action_variables] / ...
- *   - OUTSIDE ROOT: http:// example.com / sites / buddypress / members / andy / [current_component] / [current_action] / [action_variables] / [action_variables] / ...
+ *   - http:// domain.com / members / andy / [current_component] / [current_action] / [action_variables] / [action_variables] / ...
+ *   - OUTSIDE ROOT: http:// domain.com / sites / buddypress / members / andy / [current_component] / [current_action] / [action_variables] / [action_variables] / ...
  * 
  *      Example:
- *    - http://example.com/members/andy/profile/edit/group/5/
+ *    - http://domain.com/members/andy/profile/edit/group/5/
  *    - $current_component: string 'profile'
  *    - $current_action: string 'edit'
@@ -28 +28 @@
 function bp_core_set_uri_globals() {
         global $current_component, $current_action, $action_variables;
-        global $current_userid;
+        global $displayed_user_id;
         global $is_member_page, $is_new_friend;
         global $bp_unfiltered_uri;
@@ -85 +85 @@
 
         /* Catch a member page and set the current member ID */
-        if ( $bp_uri[0] == MEMBERS_SLUG && $bp_uri[1] != '' ) {
+        if ( $bp_uri[0] == MEMBERS_SLUG && !empty( $bp_uri[1] ) ) {
                 $is_member_page = true;
                 $is_root_component = true;
                 
                 // We are within a member page, set up user id globals
-                $current_userid = bp_core_get_current_userid( $bp_uri[1] );
+                $displayed_user_id = bp_core_get_displayed_userid( $bp_uri[1] );
                                 
                 unset($bp_uri[0]);
@@ -105 +105 @@
                 $bp_uri = array_merge( array(), $bp_uri );
         }
-        
+
         /* This is used to determine where the component and action indexes should start */
-        $root_components = $bp['root_components'];
+        $root_components = $bp->root_components;
         
         if ( !isset($is_root_component) )
@@ -160 +160 @@
 
         $bp_path = $pages;
-        
+
         if ( !bp_is_blog_page() )
                 remove_action( 'template_redirect', 'redirect_canonical' );
@@ -227 +227 @@
                 
         // If this user does not exist, redirect to the root domain.
-        if ( !$bp['current_userid'] && $bp_unfiltered_uri[0] == MEMBERS_SLUG && isset($bp_unfiltered_uri[1]) )
-                bp_core_redirect( $bp['root_domain'] );
+        if ( !$bp->displayed_user->id && $bp_unfiltered_uri[0] == MEMBERS_SLUG && isset($bp_unfiltered_uri[1]) )
+                bp_core_redirect( $bp->root_domain );
 
         if ( !$bp_path && !bp_is_blog_page() ) {
                 if ( is_user_logged_in() ) {
-                        wp_redirect( $bp['loggedin_domain'] );
+                        wp_redirect( $bp->loggedin_user->domain );
                 } else {
                         wp_redirect( site_url( 'wp-login.php?redirect_to=' . site_url() . $_SERVER['REQUEST_URI'] ) );
@@ -264 +264 @@
         $member_theme = get_site_option('active-member-theme');
         
-        if ( $member_theme == '' )
+        if ( empty( $member_theme ) )
                 $member_theme = 'buddypress-member';
         
@@ -283 +283 @@
         $member_theme = get_site_option('active-member-theme');
         
-        if ( $member_theme == '' )
+        if ( empty( $member_theme ) )
                 $member_theme = 'buddypress-member';
 
@@ -297 +297 @@
 add_filter( 'stylesheet', 'bp_core_force_buddypress_stylesheet', 1, 1 );
 
-
-
 ?>