Add a static blockmeta data definition to the Gutenberg instance of t…

…he theme json class (#42776)
WordPress · Jul 29, 2022 · 118876b · 118876b
1 parent ad4f2a2
commit 118876b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/lib/compat/wordpress-6.1/class-wp-theme-json-6-1.php b/lib/compat/wordpress-6.1/class-wp-theme-json-6-1.php
@@ -15,7 +15,6 @@
  * @access private
  */
 class WP_Theme_JSON_6_1 extends WP_Theme_JSON_6_0 {
-
 	/**
 	 * Define which defines which pseudo selectors are enabled for
 	 * which elements.

diff --git a/lib/experimental/class-wp-theme-json-gutenberg.php b/lib/experimental/class-wp-theme-json-gutenberg.php
@@ -15,5 +15,17 @@
  * @access private
  */
 class WP_Theme_JSON_Gutenberg extends WP_Theme_JSON_6_1 {
-
+	/**
+	 * Holds block metadata extracted from block.json
+	 * to be shared among all instances so we don't
+	 * process it twice.
+	 *
+	 * It is necessary to redefine $blocks_metadata here so that it
+	 * doesn't get inherited from an earlier instantiation of the
+	 * parent class.
+	 *
+	 * @since 5.8.0
+	 * @var array
+	 */
+	protected static $blocks_metadata = null;
 }