Improve caching.

spacedmonkey · spacedmonkey · commit e99fd7789021 · 2022-11-03T22:10:47.000Z
diff --git a/src/wp-includes/global-styles-and-settings.php b/src/wp-includes/global-styles-and-settings.php
@@ -261,18 +261,13 @@ function ( $item ) {
  *
  * @since 6.2.0
  *
- * @param boolean $clear_cache Whether the cache should be cleared and theme support recomputed. Default is false.
- *
  * @return boolean
  */
-function wp_theme_has_theme_json( $clear_cache = false ) {
-	static $theme_has_support = null;
-
-	if ( true === $clear_cache ) {
-		$theme_has_support = null;
-	}
-
-	if ( null !== $theme_has_support ) {
+function wp_theme_has_theme_json() {
+	$cache_key         = 'theme_has_support';
+	$cache_found       = false;
+	$theme_has_support = wp_cache_get( $cache_key, '', false, $cache_found );
+	if ( $cache_found ) {
 		return $theme_has_support;
 	}
 
@@ -284,6 +279,8 @@ function wp_theme_has_theme_json( $clear_cache = false ) {
 		$theme_has_support = is_readable( get_template_directory() . '/theme.json' );
 	}
 
+	wp_cache_set( $cache_key, $theme_has_support );
+
 	return $theme_has_support;
 }
 
@@ -294,6 +291,6 @@ function wp_theme_has_theme_json( $clear_cache = false ) {
  *
  */
 function wp_theme_clean_theme_json_cached_data() {
-	wp_theme_has_theme_json( true );
+	wp_cache_delete( 'theme_has_support' );
 	WP_Theme_JSON_Resolver::clean_cached_data();
 }

Original file line number	Diff line number	Diff line change
`@@ -261,18 +261,13 @@ function ( $item ) {`
`261`	`261`	`*`
`262`	`262`	`* @since 6.2.0`
`263`	`263`	`*`
`264`		`- * @param boolean $clear_cache Whether the cache should be cleared and theme support recomputed. Default is false.`
`265`		`- *`
`266`	`264`	`* @return boolean`
`267`	`265`	`*/`
`268`		`-function wp_theme_has_theme_json( $clear_cache = false ) {`
`269`		`- static $theme_has_support = null;`
`270`		`-`
`271`		`- if ( true === $clear_cache ) {`
`272`		`- $theme_has_support = null;`
`273`		`- }`
`274`		`-`
`275`		`- if ( null !== $theme_has_support ) {`
	`266`	`+function wp_theme_has_theme_json() {`
	`267`	`+ $cache_key = 'theme_has_support';`
	`268`	`+ $cache_found = false;`
	`269`	`+ $theme_has_support = wp_cache_get( $cache_key, '', false, $cache_found );`
	`270`	`+ if ( $cache_found ) {`
`276`	`271`	`return $theme_has_support;`
`277`	`272`	`}`
`278`	`273`
`@@ -284,6 +279,8 @@ function wp_theme_has_theme_json( $clear_cache = false ) {`
`284`	`279`	`$theme_has_support = is_readable( get_template_directory() . '/theme.json' );`
`285`	`280`	`}`
`286`	`281`
	`282`	`+ wp_cache_set( $cache_key, $theme_has_support );`
	`283`	`+`
`287`	`284`	`return $theme_has_support;`
`288`	`285`	`}`
`289`	`286`
`@@ -294,6 +291,6 @@ function wp_theme_has_theme_json( $clear_cache = false ) {`
`294`	`291`	`*`
`295`	`292`	`*/`
`296`	`293`	`function wp_theme_clean_theme_json_cached_data() {`
`297`		`- wp_theme_has_theme_json( true );`
	`294`	`+ wp_cache_delete( 'theme_has_support' );`
`298`	`295`	`WP_Theme_JSON_Resolver::clean_cached_data();`
`299`	`296`	`}`