Changeset 13159

Timestamp:

12/04/2021 02:53:34 PM (3 years ago)

Author:

imath

Message:

Make sure BP directory page IDs are not wrongly unset on multisite

In case a post of a different site of the multisite network has the same ID than one of the BP directory page IDs, the function can wrongly return an array in which the corresponding directory page ID is missing.

We need to make sure this function always run into the BP Root Blog context.

Props thomaslhotta

Fixes #8592

Location:

trunk

Files:

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

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

@@ -503 +503 @@
  *
  * @since 1.5.0
+ * @since 10.0.0 Eventually switch the current site to BP root's one on multisite configs.
  *
  * @param string $status 'active' to return only pages associated with active components, 'all' to return all saved
@@ -512 +513 @@
 function bp_core_get_directory_page_ids( $status = 'active' ) {
     $page_ids = bp_get_option( 'bp-pages', array() );
+    $switched = false;
+
+    /*
+     * Make sure to switch the current site to BP root's one, if needed.
+     *
+     * @see https://buddypress.trac.wordpress.org/ticket/8592
+     */
+    if ( is_multisite() ) {
+        $bp_site_id = bp_get_root_blog_id();
+
+        if ( $bp_site_id !== get_current_blog_id() ) {
+            switch_to_blog( $bp_site_id );
+            $switched = true;
+        }
+    }
 
     // Loop through pages.
@@ -535 +551 @@
             unset( $page_ids[ $component_name ] );
         }
+    }
+
+    if ( true === $switched ) {
+        restore_current_blog();
     }
 

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

@@ -286 +286 @@
 
     /**
+     * @ticket BP8592
+     */
+    public function test_bp_core_get_directory_pages_ids_ms_non_root_blog_trashed_same_page_id() {
+        if ( ! is_multisite() ) {
+            $this->markTestSkipped();
+        }
+
+        // create a blog
+        $u  = self::factory()->user->create();
+        $b1 = self::factory()->blog->create(
+            array(
+                'user_id' => $u,
+            )
+        );
+
+        // Switch to blog and create a post with the same BP Members page ID.
+        switch_to_blog( $b1 );
+
+        $dir_page_ids = bp_core_get_directory_page_ids();
+
+        $p = self::factory()->post->create(
+            array(
+                'import_id' => $dir_page_ids['members'],
+            )
+        );
+
+        // Trash the post that matches the BP Members page ID on this sub-site
+        wp_trash_post( $dir_page_ids['members'] );
+
+        // refetch BP directory page IDs
+        $page_ids = bp_core_get_directory_page_ids();
+
+        // restore blog
+        restore_current_blog();
+
+        // Now verify that our BP Members page was not wiped out
+        $this->assertTrue( $dir_page_ids['members'] === $page_ids['members'] );
+    }
+
+    /**
      * @ticket BP7193
      */