Changeset 55939

Timestamp:

06/19/2023 10:31:45 AM (11 months ago)

Author:

spacedmonkey

Message:

Themes: Fix caching issue in get_post_templates method in WP_Theme.

Fix an edge case caching issue, where if a developer use the wp_cache_themes_persistently filter and is running the site in multisite configuration, it meant block template are incorrectly cached. Block templates are stored in the posts table. But in a multisite configuration, different sites on the multisite could have different block templates stored in there post table. As themes cache group is a global group, it resulted in incorrect values being cached.

Props maniu, spacedmonkey, hellofromTonya, oglekler, mukesh27, joemcgill.
Fixes #57886.

File:

• trunk/src/wp-includes/class-wp-theme.php (modified) (1 diff)

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

@@ -1284 +1284 @@
             }
 
-            if ( current_theme_supports( 'block-templates' ) ) {
-                $block_templates = get_block_templates( array(), 'wp_template' );
-                foreach ( get_post_types( array( 'public' => true ) ) as $type ) {
-                    foreach ( $block_templates as $block_template ) {
-                        if ( ! $block_template->is_custom ) {
-                            continue;
-                        }
-
-                        if ( isset( $block_template->post_types ) && ! in_array( $type, $block_template->post_types, true ) ) {
-                            continue;
-                        }
-
-                        $post_templates[ $type ][ $block_template->slug ] = $block_template->title;
+            $this->cache_add( 'post_templates', $post_templates );
+        }
+
+        if ( current_theme_supports( 'block-templates' ) ) {
+            $block_templates = get_block_templates( array(), 'wp_template' );
+            foreach ( get_post_types( array( 'public' => true ) ) as $type ) {
+                foreach ( $block_templates as $block_template ) {
+                    if ( ! $block_template->is_custom ) {
+                        continue;
                     }
-                }
-            }
-
-            $this->cache_add( 'post_templates', $post_templates );
+
+                    if ( isset( $block_template->post_types ) && ! in_array( $type, $block_template->post_types, true ) ) {
+                        continue;
+                    }
+
+                    $post_templates[ $type ][ $block_template->slug ] = $block_template->title;
+                }
+            }
         }