Ticket #6477: 6477.02.patch

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 );
+                }
         }
 
         // Global the unfiltered offset to use in bp_core_load_template().
@@ -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 );
                                 }

tests/phpunit/testcases/routing/root-profiles.php

@@ -42 +42 @@
                 $this->assertEquals( $this->u->ID, bp_displayed_user_id() );
         }
 
+        /**
+         * @ticket BP6475
+         */
+        public function test_member_permalink_when_members_page_is_nested_under_wp_page() {
+                $p = $this->factory->post->create( array(
+                        'post_type' => 'page',
+                        'post_name' => 'foo',
+                ) );
+
+                $members_page = get_page_by_path( 'members' );
+                wp_update_post( array(
+                        'ID' => $members_page->ID,
+                        'post_parent' => $p,
+                ) );
+
+                $domain = home_url( $this->u->user_nicename );
+                $this->go_to( $domain );
+
+                $this->assertTrue( bp_is_user() );
+                $this->assertTrue( bp_is_my_profile() );
+                $this->assertEquals( $this->u->ID, bp_displayed_user_id() );
+        }
+
         public function test_member_activity_page() {
                 $url = home_url( $this->u->user_nicename ) . '/' . bp_get_activity_slug();
                 $this->go_to( $url );