Validate block registration for merged data

WordPress · Aug 18, 2023 · d1319a1 · d1319a1
1 parent b9cd9c8
commit d1319a1
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/src/wp-includes/class-wp-theme-json-resolver.php b/src/wp-includes/class-wp-theme-json-resolver.php
@@ -593,7 +593,18 @@ public static function get_merged_data( $origin = 'custom' ) {
 			$origin = 'custom';
 		}
 
-		if ( null !== static::$merged[ $origin ] ) {
+		// Map origins to block cache values.
+		$cache_map = array(
+			'default' => 'core',
+			'blocks'  => 'blocks',
+			'theme'   => 'theme',
+			'custom'  => 'user',
+		);
+
+		if (
+			null !== static::$merged[ $origin ]
+			&& static::has_same_registered_blocks( $cache_map[ $origin ] )
+		) {
 			return static::$merged[ $origin ];
 		}