Changeset 10972

Timestamp:

07/30/2016 12:32:04 PM (8 years ago)

Author:

imath

Message:

Multisite: Make sure the Blogs directory page is dynamically created when activating the component.

Fixes #7150

Location:

trunk

Files:

• src/bp-core/bp-core-functions.php (modified) (2 diffs)
• tests/phpunit/testcases/admin/functions.php (modified) (1 diff)
• tests/phpunit/testcases/core/functions.php (modified) (1 diff)

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

@@ -634 +634 @@
         'activity' => _x( 'Activity', 'Page title for the Activity directory.',       'buddypress' ),
         'groups'   => _x( 'Groups',   'Page title for the Groups directory.',         'buddypress' ),
-        'sites'    => _x( 'Sites',    'Page title for the Sites directory.',          'buddypress' ),
+        'blogs'    => _x( 'Sites',    'Page title for the Sites directory.',          'buddypress' ),
         'members'  => _x( 'Members',  'Page title for the Members directory.',        'buddypress' ),
         'activate' => _x( 'Activate', 'Page title for the user activation screen.',   'buddypress' ),
@@ -658 +658 @@
 
     // No need for a Sites directory unless we're on multisite.
-    if ( ! is_multisite() && isset( $pages_to_create['sites'] ) ) {
-        unset( $pages_to_create['sites'] );
+    if ( ! is_multisite() && isset( $pages_to_create['blogs'] ) ) {
+        unset( $pages_to_create['blogs'] );
     }
 

trunk/tests/phpunit/testcases/admin/functions.php

@@ -209 +209 @@
         $missing_pages = array();
         foreach( buddypress()->admin->notices as $notice ) {
+            if ( false !== strpos( $notice['message'], 'BuddyPress is almost ready' ) ) {
+                continue;
+            }
+
             preg_match_all( '/<strong>(.+?)<\/strong>/', $notice['message'], $missing_pages );
         }
 
-        $this->assertNotContains( 'Register', $missing_pages[1] );
-        $this->assertNotContains( 'Activate', $missing_pages[1] );
+        $this->assertEmpty( $missing_pages );
 
         // Reset buddypress() vars

trunk/tests/phpunit/testcases/core/functions.php

@@ -722 +722 @@
         $this->assertContains( $link_color, $result );
     }
+
+    /**
+     * @group bp_core_add_page_mappings
+     */
+    public function test_bp_core_add_page_mappings() {
+        $bp = buddypress();
+        $reset_bp_pages = $bp->pages;
+
+        $expected = array( 'activity', 'groups', 'members' );
+        if ( is_multisite() ) {
+            $expected = array( 'activity', 'blogs', 'groups', 'members' );
+        }
+
+        bp_core_add_page_mappings( $bp->active_components );
+        $bp_pages = array_keys( bp_get_option( 'bp-pages' ) );
+        sort( $bp_pages );
+
+        $this->assertEquals( $expected, $bp_pages );
+
+        $bp->pages = $reset_bp_pages;
+    }
 }