Changeset 54385 for trunk/src/wp-includes/class-wp-theme-json.php

Timestamp:

10/04/2022 03:48:31 PM (2 years ago)

Author:

davidbaumwald

Message:

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

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.

File:

• trunk/src/wp-includes/class-wp-theme-json.php (modified) (2 diffs)

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

@@ -34 +34 @@
      *
      * @since 5.8.0
+     * @since 6.1.0 Initialize as an empty array.
      * @var array
      */
-    protected static $blocks_metadata = null;
+    protected static $blocks_metadata = array();
 
     /**
@@ -722 +723 @@
      */
     protected static function get_blocks_metadata() {
-        if ( null !== static::$blocks_metadata ) {
-            return static::$blocks_metadata;
-        }
-
-        static::$blocks_metadata = array();
-
         $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;
+        }
+
         foreach ( $blocks as $block_name => $block_type ) {
             if (