Changeset 13679

Timestamp:

12/24/2023 04:34:15 AM (9 months ago)

Author:

imath

Message:

Make sure slugs are customizable for the BP root site

On multisite configs the BP root site can be different than the current WordPress site. It's necessary to eventually switch to the BP root site before saving custom slugs or retrieving them.

Props perchenet

Fixes #9048 (branch 12.0)

Location:

branches/12.0/src/bp-core

Files:

• admin/bp-core-admin-rewrites.php (modified) (2 diffs)
• bp-core-functions.php (modified) (2 diffs)
• bp-core-rewrites.php (modified) (1 diff)

branches/12.0/src/bp-core/admin/bp-core-admin-rewrites.php

@@ -39 +39 @@
         }
 
+        $switched_to_root_blog = false;
+
+        // Make sure the current blog is set to the root blog.
+        if ( ! bp_is_root_blog() ) {
+            switch_to_blog( bp_get_root_blog_id() );
+            $switched_to_root_blog = true;
+        }
+
         $directory_pages     = (array) bp_core_get_directory_pages();
         $current_page_slugs  = wp_list_pluck( $directory_pages, 'slug', 'id' );
@@ -96 +104 @@
         if ( $reset_rewrites ) {
             bp_delete_rewrite_rules();
+        }
+
+        if ( $switched_to_root_blog ) {
+            restore_current_blog();
         }
 

branches/12.0/src/bp-core/bp-core-functions.php

@@ -776 +776 @@
 
         // Set pages as standard class.
-        $pages = new stdClass;
+        $pages                 = new stdClass;
+        $switched_to_root_blog = false;
+
+        // Make sure the current blog is set to the root blog.
+        if ( ! bp_is_root_blog() && ! bp_is_multiblog_mode() ) {
+            switch_to_blog( bp_get_root_blog_id() );
+            $switched_to_root_blog = true;
+        }
 
         // Get pages and IDs.
@@ -816 +823 @@
                 }
             }
+        }
+
+        if ( $switched_to_root_blog ) {
+            restore_current_blog();
         }
 

branches/12.0/src/bp-core/bp-core-rewrites.php

@@ -52 +52 @@
  */
 function bp_delete_rewrite_rules() {
-    delete_option( 'rewrite_rules' );
+    bp_delete_option( 'rewrite_rules' );
 }