<!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>[57608] trunk: Themes: Add 'theme_files' cache group to block pattern cache operations.</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/57608">57608</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/57608","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>spacedmonkey</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-02-13 08:52:23 +0000 (Tue, 13 Feb 2024)</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'>Themes: Add 'theme_files' cache group to block pattern cache operations.
Use 'theme_files' cache group for block pattern caches. Previously, block pattern cache data was not stored in a cache group and used the default group. This new cache group, is setup as a global cache group, meaning that sites using multisite, will have a single cache for block pattern data per theme. This change also no longer invalidate block pattern caches in multisite instances, meaning block pattern caches can be shared between sites on a network, meaning less repeated data in the object cache.
Props spacedmonkey, flixos90, joemcgill.
Fixes <a href="https://core.trac.wordpress.org/ticket/60120">#60120</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpthemephp">trunk/src/wp-includes/class-wp-theme.php</a></li>
<li><a href="#trunksrcwpincludesloadphp">trunk/src/wp-includes/load.php</a></li>
<li><a href="#trunksrcwpincludesmsblogsphp">trunk/src/wp-includes/ms-blogs.php</a></li>
<li><a href="#trunksrcwpincludesthemephp">trunk/src/wp-includes/theme.php</a></li>
<li><a href="#trunktestsphpunitincludesabstracttestcasephp">trunk/tests/phpunit/includes/abstract-testcase.php</a></li>
<li><a href="#trunktestsphpunitteststhemewpThemeGetBlockPatternsphp">trunk/tests/phpunit/tests/theme/wpThemeGetBlockPatterns.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpthemephp"></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/class-wp-theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-theme.php 2024-02-12 23:24:19 UTC (rev 57607)
+++ trunk/src/wp-includes/class-wp-theme.php 2024-02-13 08:52:23 UTC (rev 57608)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1974,7 +1974,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $this->exists() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pattern_data = wp_cache_get( 'wp_theme_patterns_' . $this->stylesheet );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pattern_data = wp_cache_get( 'wp_theme_patterns_' . $this->stylesheet, 'theme_files' );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $pattern_data ) && $pattern_data['version'] === $this->get( 'Version' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $pattern_data['patterns'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1993,7 +1993,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'version' => $this->get( 'Version' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'patterns' => $patterns,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_cache_set( 'wp_theme_patterns_' . $this->stylesheet, $pattern_data );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_cache_set( 'wp_theme_patterns_' . $this->stylesheet, $pattern_data, 'theme_files' );
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2002,7 +2002,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function delete_pattern_cache() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_cache_delete( 'wp_theme_patterns_' . $this->stylesheet );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_cache_delete( 'wp_theme_patterns_' . $this->stylesheet, 'theme_files' );
</ins><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></span></pre></div>
<a id="trunksrcwpincludesloadphp"></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/load.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/load.php 2024-02-12 23:24:19 UTC (rev 57607)
+++ trunk/src/wp-includes/load.php 2024-02-13 08:52:23 UTC (rev 57608)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -875,6 +875,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'site-options',
</span><span class="cx" style="display: block; padding: 0 10px"> 'site-queries',
</span><span class="cx" style="display: block; padding: 0 10px"> 'site-transient',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'theme_files',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'rss',
</span><span class="cx" style="display: block; padding: 0 10px"> 'users',
</span><span class="cx" style="display: block; padding: 0 10px"> 'user-queries',
</span></span></pre></div>
<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 2024-02-12 23:24:19 UTC (rev 57607)
+++ trunk/src/wp-includes/ms-blogs.php 2024-02-13 08:52:23 UTC (rev 57608)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -565,6 +565,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'site-options',
</span><span class="cx" style="display: block; padding: 0 10px"> 'site-queries',
</span><span class="cx" style="display: block; padding: 0 10px"> 'site-transient',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'theme_files',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'rss',
</span><span class="cx" style="display: block; padding: 0 10px"> 'users',
</span><span class="cx" style="display: block; padding: 0 10px"> 'user-queries',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -658,6 +659,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'site-options',
</span><span class="cx" style="display: block; padding: 0 10px"> 'site-queries',
</span><span class="cx" style="display: block; padding: 0 10px"> 'site-transient',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'theme_files',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'rss',
</span><span class="cx" style="display: block; padding: 0 10px"> 'users',
</span><span class="cx" style="display: block; padding: 0 10px"> 'user-queries',
</span></span></pre></div>
<a id="trunksrcwpincludesthemephp"></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/theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/theme.php 2024-02-12 23:24:19 UTC (rev 57607)
+++ trunk/src/wp-includes/theme.php 2024-02-13 08:52:23 UTC (rev 57608)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -837,8 +837,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'theme_switched', $old_theme->get_stylesheet() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Clear pattern caches.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $new_theme->delete_pattern_cache();
- $old_theme->delete_pattern_cache();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_multisite() ) {
+ $new_theme->delete_pattern_cache();
+ $old_theme->delete_pattern_cache();
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Set autoload=no for the old theme, autoload=yes for the switched theme.
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_mods_options = array(
</span></span></pre></div>
<a id="trunktestsphpunitincludesabstracttestcasephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/abstract-testcase.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/abstract-testcase.php 2024-02-12 23:24:19 UTC (rev 57607)
+++ trunk/tests/phpunit/includes/abstract-testcase.php 2024-02-13 08:52:23 UTC (rev 57608)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -412,6 +412,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'site-options',
</span><span class="cx" style="display: block; padding: 0 10px"> 'site-queries',
</span><span class="cx" style="display: block; padding: 0 10px"> 'site-transient',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'theme_files',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'rss',
</span><span class="cx" style="display: block; padding: 0 10px"> 'users',
</span><span class="cx" style="display: block; padding: 0 10px"> 'user-queries',
</span></span></pre></div>
<a id="trunktestsphpunitteststhemewpThemeGetBlockPatternsphp"></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/wpThemeGetBlockPatterns.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/theme/wpThemeGetBlockPatterns.php 2024-02-12 23:24:19 UTC (rev 57607)
+++ trunk/tests/phpunit/tests/theme/wpThemeGetBlockPatterns.php 2024-02-13 08:52:23 UTC (rev 57608)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,6 +86,7 @@
</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"> * @ticket 59490
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group ms-excluded
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_clear_cache_after_switching_theme() {
</span><span class="cx" style="display: block; padding: 0 10px"> switch_theme( 'block-theme' );
</span></span></pre>
</div>
</div>
</body>
</html>