vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-01-30 21:47:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Themes: Add 'theme_files' cache group to block pattern cache operations.

Browse Source 
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 #60120.

git-svn-id: https://develop.svn.wordpress.org/trunk@57608 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Jonny Harris 2024-02-13 08:52:23 +00:00
parent 26f836091c
commit 9a8d2c4dba
6 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wp-includes/class-wp-theme.php
View File

@ -1974,7 +1974,7 @@ final class WP_Theme implements ArrayAccess {
if ( ! $this->exists() ) {
return false;
}
$pattern_data = wp_cache_get( 'wp_theme_patterns_' . $this->stylesheet );
$pattern_data = wp_cache_get( 'wp_theme_patterns_' . $this->stylesheet, 'theme_files' );
if ( is_array( $pattern_data ) && $pattern_data['version'] === $this->get( 'Version' ) ) {
return $pattern_data['patterns'];
}
@ -1993,7 +1993,7 @@ final class WP_Theme implements ArrayAccess {
'version' => $this->get( 'Version' ),
'patterns' => $patterns,
);
wp_cache_set( 'wp_theme_patterns_' . $this->stylesheet, $pattern_data );
wp_cache_set( 'wp_theme_patterns_' . $this->stylesheet, $pattern_data, 'theme_files' );
}
/**
@ -2002,7 +2002,7 @@ final class WP_Theme implements ArrayAccess {
* @since 6.4.0
*/
public function delete_pattern_cache() {
wp_cache_delete( 'wp_theme_patterns_' . $this->stylesheet );
wp_cache_delete( 'wp_theme_patterns_' . $this->stylesheet, 'theme_files' );
}
/**

1
src/wp-includes/load.php
View File

@ -875,6 +875,7 @@ function wp_start_object_cache() {
'site-options',
'site-queries',
'site-transient',
'theme_files',
'rss',
'users',
'user-queries',

2
src/wp-includes/ms-blogs.php
View File

@ -565,6 +565,7 @@ function switch_to_blog( $new_blog_id, $deprecated = null ) {
'site-options',
'site-queries',
'site-transient',
'theme_files',
'rss',
'users',
'user-queries',
@ -658,6 +659,7 @@ function restore_current_blog() {
'site-options',
'site-queries',
'site-transient',
'theme_files',
'rss',
'users',
'user-queries',

6
src/wp-includes/theme.php
View File

@ -837,8 +837,10 @@ function switch_theme( $stylesheet ) {
update_option( 'theme_switched', $old_theme->get_stylesheet() );
// Clear pattern caches.
$new_theme->delete_pattern_cache();
$old_theme->delete_pattern_cache();
if ( ! is_multisite() ) {
$new_theme->delete_pattern_cache();
$old_theme->delete_pattern_cache();
}
// Set autoload=no for the old theme, autoload=yes for the switched theme.
$theme_mods_options = array(

1
tests/phpunit/includes/abstract-testcase.php
View File

@ -412,6 +412,7 @@ abstract class WP_UnitTestCase_Base extends PHPUnit_Adapter_TestCase {
'site-options',
'site-queries',
'site-transient',
'theme_files',
'rss',
'users',
'user-queries',

1
tests/phpunit/tests/theme/wpThemeGetBlockPatterns.php
View File

@ -86,6 +86,7 @@ class Tests_Theme_WPThemeGetBlockPatterns extends WP_UnitTestCase {
/**
* @ticket 59490
* @group ms-excluded
*/
public function test_should_clear_cache_after_switching_theme() {
switch_theme( 'block-theme' );