Changeset 10212 for trunk/src/bp-core/bp-core-catchuri.php

Timestamp:

10/08/2015 04:52:31 AM (10 years ago)

Author:

r-a-y

Message:

URI: Allow root profiles to work when the 'Members' page is nested.

Previously, if the Members page was nested as a child of another page, the
root profiles feature - define( 'BP_ENABLE_ROOT_PROFILES', true ); - did
not work. This commit fixes this and includes a unit test.

Commit also adds a minor performance tweak when a root profile is detected.

Props r-a-y, boonebgorges.

Fixes #6477.

File:

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

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

@@ -241 +241 @@
     // Rejig the offset
     if ( !empty( $slug ) && ( 1 < count( $slug ) ) ) {
-        array_pop( $slug );
-        $uri_offset = count( $slug );
+        // Only offset if not on a root profile. Fixes issue when Members page is nested.
+        if ( false === $root_profile ) {
+            array_pop( $slug );
+            $uri_offset = count( $slug );
+        }
     }
 
@@ -265 +268 @@
             // Are we viewing a specific user?
             if ( $after_member_slug ) {
+                // If root profile, we've already queried for the user
+                if ( $root_profile instanceof WP_User ) {
+                    $bp->displayed_user->id = $root_profile->ID;
+
                 // Switch the displayed_user based on compatibility mode
-                if ( bp_is_username_compatibility_mode() ) {
+                } elseif ( bp_is_username_compatibility_mode() ) {
                     $bp->displayed_user->id = (int) bp_core_get_userid( urldecode( $after_member_slug ) );
+
                 } else {
                     $bp->displayed_user->id = (int) bp_core_get_userid_from_nicename( $after_member_slug );