Refill variations cache if blocks changed

WordPress · Jun 19, 2024 · 04948a0 · 04948a0
1 parent cdd91c9
commit 04948a0
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/lib/class-wp-theme-json-resolver-gutenberg.php b/lib/class-wp-theme-json-resolver-gutenberg.php
@@ -784,9 +784,17 @@ protected static function get_style_variation_files() {
 	 * @return array
 	 */
 	public static function get_style_variations( $scope = 'theme' ) {
+		$registry  = WP_Block_Type_Registry::get_instance();
+		$blocks    = $registry->get_all_registered();
 		$theme_dir = get_stylesheet_directory();
 		$locale    = get_locale();
-		if ( isset( static::$style_variations_cache[ $theme_dir ][ $locale ][ $scope ] ) ) {
+
+		if (
+			isset( static::$style_variations_cache[ $theme_dir ][ $locale ][ $scope ] ) &&
+			// Variations depend on registered blocks.
+			null !== static::$blocks &&
+			static::has_same_registered_blocks( 'theme' )
+		) {
 			return static::$style_variations_cache[ $theme_dir ][ $locale ][ $scope ];
 		}