From ea0a4881aeaa97c09bdab0ba7d3895dc29ea6247 Mon Sep 17 00:00:00 2001 From: Jonny Harris Date: Mon, 19 Jun 2023 10:31:45 +0000 Subject: [PATCH] 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. git-svn-id: https://develop.svn.wordpress.org/trunk@55939 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/class-wp-theme.php | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/wp-includes/class-wp-theme.php b/src/wp-includes/class-wp-theme.php index 7cde57f4f9..6ed07f0d85 100644 --- a/src/wp-includes/class-wp-theme.php +++ b/src/wp-includes/class-wp-theme.php @@ -1283,24 +1283,24 @@ final class WP_Theme implements ArrayAccess { } } - 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; + 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 ( $this->load_textdomain() ) {