WordPress-C/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-02-27 18:16:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Editor: Invalidate blocks metadata cache when needed in WP_Theme_JSON::get_blocks_metadata().

Browse Source 
This change ensures that user-supplied global styles settings for blocks aren't lost due to sanitization.  This could previously occur due to outdated blocks metadata that did not include all registered blocks.

Props jorgefilipecosta, andrewserong, oandregal, talldanwp, cbravobernal, bernhard-reiter, hellofromTonya.
Fixes #56644.
Built from https://develop.svn.wordpress.org/trunk@54385


git-svn-id: http://core.svn.wordpress.org/trunk@53944 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
davidbaumwald 2022-10-04 15:50:12 +00:00
parent 2ede19910a
commit 335ecfdca9
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wp-includes/class-wp-theme-json.php
View File

@ -33,9 +33,10 @@ class WP_Theme_JSON {
* process it twice. * process it twice.
* *
* @since 5.8.0 * @since 5.8.0
* @since 6.1.0 Initialize as an empty array.
* @var array * @var array
*/ */
protected static $blocks_metadata = null; protected static $blocks_metadata = array();
/** /**
* The CSS selector for the top-level styles. * The CSS selector for the top-level styles.
@ -721,14 +722,15 @@ class WP_Theme_JSON {
* @return array Block metadata. * @return array Block metadata.
*/ */
protected static function get_blocks_metadata() { protected static function get_blocks_metadata() {
if ( null !== static::$blocks_metadata ) { $registry = WP_Block_Type_Registry::get_instance();
$blocks = $registry->get_all_registered();
// Is there metadata for all currently registered blocks?
$blocks = array_diff_key( $blocks, static::$blocks_metadata );
if ( empty( $blocks ) ) {
return static::$blocks_metadata; return static::$blocks_metadata;
} }
static::$blocks_metadata = array();
$registry = WP_Block_Type_Registry::get_instance();
$blocks = $registry->get_all_registered();
foreach ( $blocks as $block_name => $block_type ) { foreach ( $blocks as $block_name => $block_type ) {
if ( if (
isset( $block_type->supports['__experimentalSelector'] ) && isset( $block_type->supports['__experimentalSelector'] ) &&

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.1-beta2-54384'; $wp_version = '6.1-beta2-54385';
/** /**
* 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.