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

Timestamp:

02/21/2024 07:24:12 PM (13 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/load.php (modified) (2 diffs)

trunk/src/wp-includes/load.php

@@ -1047 +1047 @@
  * @access private
  *
- * @global string $pagenow The filename of the current screen.
+ * @global string $pagenow            The filename of the current screen.
+ * @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 string[] Array of absolute paths to theme directories.
  */
 function wp_get_active_and_valid_themes() {
-    global $pagenow;
+    global $pagenow, $wp_stylesheet_path, $wp_template_path;
 
     $themes = array();
@@ -1060 +1062 @@
     }
 
-    $stylesheet_path = get_stylesheet_directory();
-    $template_path   = get_template_directory();
-
-    if ( $template_path !== $stylesheet_path ) {
-        $themes[] = $stylesheet_path;
-    }
-
-    $themes[] = $template_path;
+    if ( is_child_theme() ) {
+        $themes[] = $wp_stylesheet_path;
+    }
+
+    $themes[] = $wp_template_path;
 
     /*