Changeset 57608

Timestamp:

02/13/2024 08:52:23 AM (2 years ago)

Author:

spacedmonkey

Message:

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

Location:

trunk

Files:

• src/wp-includes/class-wp-theme.php (modified) (3 diffs)
• src/wp-includes/load.php (modified) (1 diff)
• src/wp-includes/ms-blogs.php (modified) (2 diffs)
• src/wp-includes/theme.php (modified) (1 diff)
• tests/phpunit/includes/abstract-testcase.php (modified) (1 diff)
• tests/phpunit/tests/theme/wpThemeGetBlockPatterns.php (modified) (1 diff)

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

@@ -1975 +1975 @@
                         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'];
@@ -1994 +1994 @@
                         'patterns' => $patterns,
                 );
-                wp_cache_set( 'wp_theme_patterns_' . $this->stylesheet, $pattern_data );
+                wp_cache_set( 'wp_theme_patterns_' . $this->stylesheet, $pattern_data, 'theme_files' );
         }
 
@@ -2003 +2003 @@
          */
         public function delete_pattern_cache() {
-                wp_cache_delete( 'wp_theme_patterns_' . $this->stylesheet );
+                wp_cache_delete( 'wp_theme_patterns_' . $this->stylesheet, 'theme_files' );
         }
 

trunk/src/wp-includes/load.php

@@ -876 +876 @@
                                 'site-queries',
                                 'site-transient',
+                                'theme_files',
                                 'rss',
                                 'users',

trunk/src/wp-includes/ms-blogs.php

@@ -566 +566 @@
                                                 'site-queries',
                                                 'site-transient',
+                                                'theme_files',
                                                 'rss',
                                                 'users',
@@ -659 +660 @@
                                                 'site-queries',
                                                 'site-transient',
+                                                'theme_files',
                                                 'rss',
                                                 'users',

trunk/src/wp-includes/theme.php

@@ -838 +838 @@
 
         // 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.

trunk/tests/phpunit/includes/abstract-testcase.php

@@ -413 +413 @@
                                 'site-queries',
                                 'site-transient',
+                                'theme_files',
                                 'rss',
                                 'users',

trunk/tests/phpunit/tests/theme/wpThemeGetBlockPatterns.php

@@ -87 +87 @@
         /**
          * @ticket 59490
+         * @group ms-excluded
          */
         public function test_should_clear_cache_after_switching_theme() {