Changeset 57685 for trunk/src/wp-includes/theme.php

Timestamp:

02/21/2024 07:24:12 PM (15 months ago)

Author:

joemcgill

Message:

Themes: Use original template paths when switching blogs.

This fixes a bug introduced by [57129] and [56635] in which deprecating the previous TEMPLATEPATH and STYLESHEETPATH constants in favor of get_template_directory() and get_stylesheet_directory() functions caused the active theme template path to change when using switch_to_blog().

This introduces a new function, wp_set_template_globals(), which is called during the bootstrap process to store the template paths to new globals values $wp_template_path and $wp_stylesheet_path. This restores behavior to how things worked prior to [56635] but retains the ability for template values to be reset for better testability.

Related #18298, #60025.

Props joemcgill, flixos90, mukesh27, swissspidy, manfcarlo, metropolis_john, jeremyfelt.
Fixes #60290.

File:

• trunk/src/wp-includes/theme.php (modified) (2 diffs)

trunk/src/wp-includes/theme.php

@@ -154 +154 @@
  *
  * @since 3.0.0
+ * @since 6.5.0 Makes use of global template variables.
+ *
+ * @global string $wp_stylesheet_path Path to current theme's stylesheet directory.
+ * @global string $wp_template_path   Path to current theme's template directory.
  *
  * @return bool True if a child theme is in use, false otherwise.
  */
 function is_child_theme() {
-    return get_template_directory() !== get_stylesheet_directory();
+    global $wp_stylesheet_path, $wp_template_path;
+
+    return $wp_stylesheet_path !== $wp_template_path;
 }
 
@@ -836 +842 @@
 
     update_option( 'theme_switched', $old_theme->get_stylesheet() );
+
+    /*
+     * Reset template globals when switching themes outside of a switched blog
+     * context to ensure templates will be loaded from the new theme.
+     */
+    if ( ! is_multisite() || ! ms_is_switched() ) {
+        wp_set_template_globals();
+    }
 
     // Clear pattern caches.