Changeset 9914

Timestamp:

06/04/2015 01:14:46 PM (11 years ago)

Author:

boonebgorges

Message:

Allow Members directory pages to be nested under other pages.

A bug was introduced in [9723] that broke the way that URIs are parsed when
viewing a Members directory page, when that page is the child of another
WP page.

Props r-a-y.
See #6475.

Location:

trunk

Files:

• src/bp-core/bp-core-catchuri.php (modified) (1 diff)
• tests/phpunit/testcases/routing/members.php (modified) (1 diff)

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

@@ -316 +316 @@
                                         $bp->current_component = '';
                                 }
-                        }
-
-                        // Reset the offset
-                        $uri_offset = 0;
+
+                                // Reset the offset
+                                $uri_offset = 0;
+                        }
                 }
         }

trunk/tests/phpunit/testcases/routing/members.php

@@ -28 +28 @@
                 $this->go_to( bp_core_get_user_domain( bp_loggedin_user_id() ) );
                 $this->assertTrue( bp_is_my_profile() );
+        }
+
+        /**
+         * @ticket BP6475
+         */
+        public function test_member_directory_when_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,
+                ) );
+
+                $members_page_permalink = bp_get_root_domain() . '/foo/members/';
+                $this->go_to( $members_page_permalink );
+
+                $this->assertTrue( bp_is_members_component() );
+                $this->assertEquals( '', bp_current_action() );
         }