Changeset 9916

Timestamp:

06/04/2015 05:37:04 PM (9 years ago)

Author:

boonebgorges

Message:

Allow Members directory page to be nested, after [9723].

Merges [9913] and [9914] into the 2.3 branch.

Props r-a-y.
See #6475.

Location:

branches/2.3

Files:

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

branches/2.3/src/bp-core/bp-core-catchuri.php

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

branches/2.3/tests/phpunit/includes/testcase.php

@@ -51 +51 @@
         buddypress()->displayed_user        = new stdClass();
         buddypress()->loggedin_user         = new stdClass();
+        buddypress()->pages                 = array();
 
         parent::clean_up_global_scope();

branches/2.3/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() );
     }