Changeset 56974

Timestamp:

10/19/2023 07:07:13 PM (9 months ago)

Author:

flixos90

Message:

Multisite: Ensure that switching sites resets the current theme directory globals.

The globals introduced in [56635] to cache the current theme directories in memory were not considering switching sites in a multisite network. This changeset addresses the bug including test coverage.

Props codex-m, jeremyfelt.
Fixes #59677.
See #18298.

Location:

trunk

Files:

• src/wp-includes/ms-blogs.php (modified) (4 diffs)
• tests/phpunit/tests/theme.php (modified) (1 diff)

trunk/src/wp-includes/ms-blogs.php

@@ -492 +492 @@
  * @global bool            $switched
  * @global string          $table_prefix
+
+
  * @global WP_Object_Cache $wp_object_cache
  *
@@ -533 +535 @@
 
     $wpdb->set_blog_id( $new_blog_id );
-    $GLOBALS['table_prefix'] = $wpdb->get_blog_prefix();
-    $GLOBALS['blog_id']      = $new_blog_id;
+    $GLOBALS['table_prefix']       = $wpdb->get_blog_prefix();
+    $GLOBALS['blog_id']            = $new_blog_id;
+    $GLOBALS['wp_template_path']   = null;
+    $GLOBALS['wp_stylesheet_path'] = null;
 
     if ( function_exists( 'wp_cache_switch_to_blog' ) ) {
@@ -601 +605 @@
  * @global bool            $switched
  * @global string          $table_prefix
+
+
  * @global WP_Object_Cache $wp_object_cache
  *
@@ -626 +632 @@
 
     $wpdb->set_blog_id( $new_blog_id );
-    $GLOBALS['blog_id']      = $new_blog_id;
-    $GLOBALS['table_prefix'] = $wpdb->get_blog_prefix();
+    $GLOBALS['blog_id']            = $new_blog_id;
+    $GLOBALS['table_prefix']       = $wpdb->get_blog_prefix();
+    $GLOBALS['wp_template_path']   = null;
+    $GLOBALS['wp_stylesheet_path'] = null;
 
     if ( function_exists( 'wp_cache_switch_to_blog' ) ) {

trunk/tests/phpunit/tests/theme.php

@@ -1060 +1060 @@
 
     /**
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
      * Helper function to ensure that a block theme is available and active.
      */