From 111de9f83f0de50e9d98150b7b20e5035e6466ea Mon Sep 17 00:00:00 2001
From: Joe McGill <joe.mcgill@10up.com>
Date: Thu, 9 Nov 2023 08:43:17 -0600
Subject: [PATCH] Remove unnecessary global resets

---
 src/wp-includes/ms-blogs.php | 16 ++++------------
 src/wp-includes/theme.php    | 13 +------------
 2 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/src/wp-includes/ms-blogs.php b/src/wp-includes/ms-blogs.php
index 7e91e11b8532f..eddb99c605cff 100644
--- a/src/wp-includes/ms-blogs.php
+++ b/src/wp-includes/ms-blogs.php
@@ -491,8 +491,6 @@ function update_blog_option( $id, $option, $value, $deprecated = null ) {
  * @global array           $_wp_switched_stack
  * @global bool            $switched
  * @global string          $table_prefix
- * @global string          $wp_template_path
- * @global string          $wp_stylesheet_path
  * @global WP_Object_Cache $wp_object_cache
  *
  * @param int  $new_blog_id The ID of the blog to switch to. Default: current blog.
@@ -534,10 +532,8 @@ function switch_to_blog( $new_blog_id, $deprecated = null ) {
 	}
 
 	$wpdb->set_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;
+	$GLOBALS['table_prefix'] = $wpdb->get_blog_prefix();
+	$GLOBALS['blog_id']      = $new_blog_id;
 
 	if ( function_exists( 'wp_cache_switch_to_blog' ) ) {
 		wp_cache_switch_to_blog( $new_blog_id );
@@ -604,8 +600,6 @@ function switch_to_blog( $new_blog_id, $deprecated = null ) {
  * @global int             $blog_id
  * @global bool            $switched
  * @global string          $table_prefix
- * @global string          $wp_template_path
- * @global string          $wp_stylesheet_path
  * @global WP_Object_Cache $wp_object_cache
  *
  * @return bool True on success, false if we're already on the current blog.
@@ -631,10 +625,8 @@ function restore_current_blog() {
 	}
 
 	$wpdb->set_blog_id( $new_blog_id );
-	$GLOBALS['blog_id']            = $new_blog_id;
-	$GLOBALS['table_prefix']       = $wpdb->get_blog_prefix();
-	$GLOBALS['wp_template_path']   = null;
-	$GLOBALS['wp_stylesheet_path'] = null;
+	$GLOBALS['blog_id']      = $new_blog_id;
+	$GLOBALS['table_prefix'] = $wpdb->get_blog_prefix();
 
 	if ( function_exists( 'wp_cache_switch_to_blog' ) ) {
 		wp_cache_switch_to_blog( $new_blog_id );
diff --git a/src/wp-includes/theme.php b/src/wp-includes/theme.php
index a943061f52fc6..12e3b98b9b995 100644
--- a/src/wp-includes/theme.php
+++ b/src/wp-includes/theme.php
@@ -328,8 +328,6 @@ function get_template() {
  * @since 6.4.0 Memoizes filter execution so that it only runs once for the current theme.
  * @since 6.4.1 Memoization removed.
  *
- * @global string $wp_template_path Current theme template directory path.
- *
  * @return string Path to active theme's template directory.
  */
 function get_template_directory() {
@@ -752,13 +750,11 @@ function locale_stylesheet() {
  * @global WP_Customize_Manager $wp_customize
  * @global array                $sidebars_widgets
  * @global array                $wp_registered_sidebars
- * @global string               $wp_stylesheet_path
- * @global string               $wp_template_path
  *
  * @param string $stylesheet Stylesheet name.
  */
 function switch_theme( $stylesheet ) {
-	global $wp_theme_directories, $wp_customize, $sidebars_widgets, $wp_registered_sidebars, $wp_stylesheet_path, $wp_template_path;
+	global $wp_theme_directories, $wp_customize, $sidebars_widgets, $wp_registered_sidebars;
 
 	$requirements = validate_theme_requirements( $stylesheet );
 	if ( is_wp_error( $requirements ) ) {
@@ -842,13 +838,6 @@ function switch_theme( $stylesheet ) {
 
 	update_option( 'theme_switched', $old_theme->get_stylesheet() );
 
-	/*
-	 * Reset globals to force refresh the next time these directories are
-	 * accessed via `get_stylesheet_directory()` / `get_template_directory()`.
-	 */
-	$wp_stylesheet_path = null;
-	$wp_template_path   = null;
-
 	// Clear pattern caches.
 	$new_theme->delete_pattern_cache();
 	$old_theme->delete_pattern_cache();