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

Timestamp:

02/21/2024 07:24:12 PM (11 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-admin/includes/theme.php (modified) (3 diffs)

trunk/src/wp-admin/includes/theme.php

@@ -1161 +1161 @@
  * @since 5.2.0
  *
+ * @global string $wp_stylesheet_path Path to current theme's stylesheet directory.
+ * @global string $wp_template_path   Path to current theme's template directory.
+ *
  * @param string $theme    Single theme to resume.
  * @param string $redirect Optional. URL to redirect to. Default empty string.
@@ -1167 +1170 @@
  */
 function resume_theme( $theme, $redirect = '' ) {
+    global $wp_stylesheet_path, $wp_template_path;
+
     list( $extension ) = explode( '/', $theme );
 
@@ -1174 +1179 @@
      */
     if ( ! empty( $redirect ) ) {
-        $stylesheet_path = get_stylesheet_directory();
-        $template_path   = get_template_directory();
-
         $functions_path = '';
-        if ( str_contains( $stylesheet_path, $extension ) ) {
-            $functions_path = $stylesheet_path . '/functions.php';
-        } elseif ( str_contains( $template_path, $extension ) ) {
-            $functions_path = $template_path . '/functions.php';
+        if ( str_contains( $wp_stylesheet_path, $extension ) ) {
+            $functions_path = $wp_stylesheet_path . '/functions.php';
+        } elseif ( str_contains( $wp_template_path, $extension ) ) {
+            $functions_path = $wp_template_path . '/functions.php';
         }