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

Timestamp:

08/31/2009 05:51:29 PM (17 years ago)

Author:

apeatling

Message:

Enabled support for users to appear in the root by defining 'BP_ENABLE_ROOT_PROFILES' as true in your wp-config.php file.

File:

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

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

@@ -29 +29 @@
     global $current_component, $current_action, $action_variables;
     global $displayed_user_id;
-    global $is_member_page, $is_new_friend;
+    global $is_member_page;
     global $bp_unfiltered_uri;
     global $bp, $current_blog;
@@ -99 +99 @@
 
     /* Catch a member page and set the current member ID */
-    if ( $bp_uri[0] == BP_MEMBERS_SLUG || in_array( 'wp-load.php', $bp_uri ) ) {
-        $is_member_page = true;
-        $is_root_component = true;
-
-        // We are within a member page, set up user id globals
-        $displayed_user_id = bp_core_get_displayed_userid( $bp_uri[1] );
+    if ( !defined( 'BP_ENABLE_ROOT_PROFILES' ) ) {
+        if ( $bp_uri[0] == BP_MEMBERS_SLUG || in_array( 'wp-load.php', $bp_uri ) ) {
+            $is_member_page = true;
+            $is_root_component = true;
+
+            // We are within a member page, set up user id globals
+            $displayed_user_id = bp_core_get_displayed_userid( $bp_uri[1] );
                 
-        unset($bp_uri[0]);
-        unset($bp_uri[1]);
+            unset($bp_uri[0]);
+            unset($bp_uri[1]);
         
-        // if the get variable 'new' is set this the first visit to a new friends profile.
-        // this means we need to delete friend acceptance notifications, so we set a flag of is_new_friend.
-        if ( isset($_GET['new']) ) {
-            $is_new_friend = 1;
-            unset($bp_uri[2]);
-        }
-        
-        /* Reset the keys by merging with an empty array */
-        $bp_uri = array_merge( array(), $bp_uri );
-    }
-
+            /* Reset the keys by merging with an empty array */
+            $bp_uri = array_merge( array(), $bp_uri );
+        }
+    } else {
+        if ( get_userdatabylogin( $bp_uri[0] ) || in_array( 'wp-load.php', $bp_uri ) ) {
+            $is_member_page = true;
+            $is_root_component = true;
+
+            // We are within a member page, set up user id globals
+            $displayed_user_id = bp_core_get_displayed_userid( $bp_uri[0] );
+                
+            unset($bp_uri[0]);
+
+            /* Reset the keys by merging with an empty array */
+            $bp_uri = array_merge( array(), $bp_uri );
+        }
+    }
+    
     if ( !isset($is_root_component) )
         $is_root_component = in_array( $bp_uri[0], $bp->root_components );
@@ -193 +201 @@
     
     $page = $bp_path;
-
+    
     /* Don't hijack any URLs on blog pages */
     if ( !$bp_skip_blog_check ) {
@@ -199 +207 @@
             return false;
     }
-    
+
     /* Make sure this is not reported as a 404 */
     if ( !$bp_no_status_set ) {
@@ -208 +216 @@
             $wp_query->is_page = true;
     }
+
 
     if ( $located_template = locate_template( array( $page . '.php' ) ) ) {