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. Built from https://develop.svn.wordpress.org/trunk@55939 git-svn-id: http://core.svn.wordpress.org/trunk@55451 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
3d94d17402
commit
dac560b77d
|
@ -1283,24 +1283,24 @@ final class WP_Theme implements ArrayAccess {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( current_theme_supports( 'block-templates' ) ) {
|
$this->cache_add( 'post_templates', $post_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 ) ) {
|
if ( current_theme_supports( 'block-templates' ) ) {
|
||||||
continue;
|
$block_templates = get_block_templates( array(), 'wp_template' );
|
||||||
}
|
foreach ( get_post_types( array( 'public' => true ) ) as $type ) {
|
||||||
|
foreach ( $block_templates as $block_template ) {
|
||||||
$post_templates[ $type ][ $block_template->slug ] = $block_template->title;
|
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() ) {
|
if ( $this->load_textdomain() ) {
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
*
|
*
|
||||||
* @global string $wp_version
|
* @global string $wp_version
|
||||||
*/
|
*/
|
||||||
$wp_version = '6.3-alpha-55938';
|
$wp_version = '6.3-alpha-55939';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||||
|
|
Loading…
Reference in New Issue