<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[56974] trunk: Multisite: Ensure that switching sites resets the current theme directory globals.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/56974">56974</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/56974","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>flixos90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-10-19 19:07:13 +0000 (Thu, 19 Oct 2023)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Multisite: Ensure that switching sites resets the current theme directory globals.
The globals introduced in <a href="https://core.trac.wordpress.org/changeset/56635">[56635]</a> 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 <a href="https://core.trac.wordpress.org/ticket/59677">#59677</a>.
See <a href="https://core.trac.wordpress.org/ticket/18298">#18298</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesmsblogsphp">trunk/src/wp-includes/ms-blogs.php</a></li>
<li><a href="#trunktestsphpunitteststhemephp">trunk/tests/phpunit/tests/theme.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesmsblogsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/ms-blogs.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-blogs.php 2023-10-19 15:03:51 UTC (rev 56973)
+++ trunk/src/wp-includes/ms-blogs.php 2023-10-19 19:07:13 UTC (rev 56974)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -491,6 +491,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global array $_wp_switched_stack
</span><span class="cx" style="display: block; padding: 0 10px"> * @global bool $switched
</span><span class="cx" style="display: block; padding: 0 10px"> * @global string $table_prefix
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global string $wp_template_path
+ * @global string $wp_stylesheet_path
</ins><span class="cx" style="display: block; padding: 0 10px"> * @global WP_Object_Cache $wp_object_cache
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $new_blog_id The ID of the blog to switch to. Default: current blog.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -532,8 +534,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->set_blog_id( $new_blog_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $GLOBALS['table_prefix'] = $wpdb->get_blog_prefix();
- $GLOBALS['blog_id'] = $new_blog_id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $GLOBALS['table_prefix'] = $wpdb->get_blog_prefix();
+ $GLOBALS['blog_id'] = $new_blog_id;
+ $GLOBALS['wp_template_path'] = null;
+ $GLOBALS['wp_stylesheet_path'] = null;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( function_exists( 'wp_cache_switch_to_blog' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_switch_to_blog( $new_blog_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -600,6 +604,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global int $blog_id
</span><span class="cx" style="display: block; padding: 0 10px"> * @global bool $switched
</span><span class="cx" style="display: block; padding: 0 10px"> * @global string $table_prefix
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global string $wp_template_path
+ * @global string $wp_stylesheet_path
</ins><span class="cx" style="display: block; padding: 0 10px"> * @global WP_Object_Cache $wp_object_cache
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool True on success, false if we're already on the current blog.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -625,8 +631,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->set_blog_id( $new_blog_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $GLOBALS['blog_id'] = $new_blog_id;
- $GLOBALS['table_prefix'] = $wpdb->get_blog_prefix();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $GLOBALS['blog_id'] = $new_blog_id;
+ $GLOBALS['table_prefix'] = $wpdb->get_blog_prefix();
+ $GLOBALS['wp_template_path'] = null;
+ $GLOBALS['wp_stylesheet_path'] = null;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( function_exists( 'wp_cache_switch_to_blog' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_switch_to_blog( $new_blog_id );
</span></span></pre></div>
<a id="trunktestsphpunitteststhemephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/theme.php 2023-10-19 15:03:51 UTC (rev 56973)
+++ trunk/tests/phpunit/tests/theme.php 2023-10-19 19:07:13 UTC (rev 56974)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1059,6 +1059,102 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Tests whether a switched site retrieves the correct stylesheet directory.
+ *
+ * @ticket 59677
+ * @group ms-required
+ *
+ * @covers ::get_stylesheet_directory
+ */
+ public function test_get_stylesheet_directory_with_switched_site() {
+ $blog_id = self::factory()->blog->create();
+
+ update_blog_option( $blog_id, 'stylesheet', 'switched_stylesheet' );
+
+ // Prime global storage with the current site's data.
+ get_stylesheet_directory();
+
+ switch_to_blog( $blog_id );
+ $switched_stylesheet = get_stylesheet_directory();
+ restore_current_blog();
+
+ $this->assertSame( WP_CONTENT_DIR . '/themes/switched_stylesheet', $switched_stylesheet );
+ }
+
+ /**
+ * Tests whether a switched site retrieves the correct template directory.
+ *
+ * @ticket 59677
+ * @group ms-required
+ *
+ * @covers ::get_template_directory
+ */
+ public function test_get_template_directory_with_switched_site() {
+ $blog_id = self::factory()->blog->create();
+
+ update_blog_option( $blog_id, 'template', 'switched_template' );
+
+ // Prime global storage with the current site's data.
+ get_template_directory();
+
+ switch_to_blog( $blog_id );
+ $switched_template = get_template_directory();
+ restore_current_blog();
+
+ $this->assertSame( WP_CONTENT_DIR . '/themes/switched_template', $switched_template );
+ }
+
+ /**
+ * Tests whether a restored site retrieves the correct stylesheet directory.
+ *
+ * @ticket 59677
+ * @group ms-required
+ *
+ * @covers ::get_stylesheet_directory
+ */
+ public function test_get_stylesheet_directory_with_restored_site() {
+ $blog_id = self::factory()->blog->create();
+
+ update_option( 'stylesheet', 'original_stylesheet' );
+ update_blog_option( $blog_id, 'stylesheet', 'switched_stylesheet' );
+
+ $stylesheet = get_stylesheet_directory();
+
+ switch_to_blog( $blog_id );
+
+ // Prime global storage with the restored site's data.
+ get_stylesheet_directory();
+ restore_current_blog();
+
+ $this->assertSame( WP_CONTENT_DIR . '/themes/original_stylesheet', $stylesheet );
+ }
+
+ /**
+ * Tests whether a restored site retrieves the correct template directory.
+ *
+ * @ticket 59677
+ * @group ms-required
+ *
+ * @covers ::get_template_directory
+ */
+ public function test_get_template_directory_with_restored_site() {
+ $blog_id = self::factory()->blog->create();
+
+ update_option( 'template', 'original_template' );
+ update_blog_option( $blog_id, 'template', 'switched_template' );
+
+ $template = get_template_directory();
+
+ switch_to_blog( $blog_id );
+
+ // Prime global storage with the switched site's data.
+ get_template_directory();
+ restore_current_blog();
+
+ $this->assertSame( WP_CONTENT_DIR . '/themes/original_template', $template );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Helper function to ensure that a block theme is available and active.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> private function helper_requires_block_theme() {
</span></span></pre>
</div>
</div>
</body>
</html>