Cache only the theme json

WordPress · Oct 5, 2022 · e2704ab · e2704ab
1 parent 2775e75
commit e2704ab
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/wp-includes/class-wp-theme-json-resolver.php b/src/wp-includes/class-wp-theme-json-resolver.php
@@ -186,19 +186,22 @@ public static function get_theme_data( $deprecated = array(), $options = array()
 		}
 
 		$options = wp_parse_args( $options, array( 'with_supports' => true ) );
-		if ( null === static::$theme && null === static::$theme_json_data ) {
+		if ( null === static::$theme_json_data ) {
+
 			$theme_json_data = static::read_json_file( static::get_file_path_from_theme( 'theme.json' ) );
 			$theme_json_data = static::translate( $theme_json_data, wp_get_theme()->get( 'TextDomain' ) );
+
 			/**
 			 * Filters the data provided by the theme for global styles & settings.
 			 *
 			 * @since 6.1.0
 			 *
 			 * @param WP_Theme_JSON_Data Class to access and update the underlying data.
 			 */
+
+			static::$theme_json_data = $theme_json_data;
 			$theme_json              = apply_filters( 'theme_json_theme', new WP_Theme_JSON_Data( $theme_json_data, 'theme' ) );
 			$theme_json_data         = $theme_json->get_data();
-			static::$theme_json_data = $theme_json_data;
 			static::$theme           = new WP_Theme_JSON( $theme_json_data );
 
 			if ( wp_get_theme()->parent() ) {
@@ -213,7 +216,7 @@ public static function get_theme_data( $deprecated = array(), $options = array()
 				static::$theme = $parent_theme;
 			}
 		}
-
+		static::$theme = new WP_Theme_JSON( static::$theme_json_data );
 		if ( ! $options['with_supports'] ) {
 			return static::$theme;
 		}