Implement object cache for gutenberg_get_global_settings (WordPress#45372)

oandregal · mpkelly · commit b8415be7aa0b · 2022-12-07T16:51:43.000Z
diff --git a/lib/compat/wordpress-6.2/get-global-styles-and-settings.php b/lib/compat/wordpress-6.2/get-global-styles-and-settings.php
@@ -171,7 +171,15 @@ function gutenberg_get_global_settings( $path = array(), $context = array() ) {
 		$origin = 'theme';
 	}
 
-	$settings = WP_Theme_JSON_Resolver_Gutenberg::get_merged_data( $origin )->get_settings();
+	$cache_group = 'theme_json';
+	$cache_key   = 'gutenberg_get_global_settings_' . $origin;
+	$settings    = wp_cache_get( $cache_key, $cache_group );
+
+	if ( false === $settings || WP_DEBUG ) {
+		$settings = WP_Theme_JSON_Resolver_Gutenberg::get_merged_data( $origin )->get_settings();
+		wp_cache_set( $cache_key, $settings, $cache_group );
+	}
+
 	return _wp_array_get( $settings, $path, $settings );
 }
 
@@ -183,6 +191,7 @@ function gutenberg_get_global_settings( $path = array(), $context = array() ) {
 function _gutenberg_clean_theme_json_caches() {
 	wp_cache_delete( 'wp_theme_has_theme_json', 'theme_json' );
 	wp_cache_delete( 'gutenberg_get_global_stylesheet', 'theme_json' );
+	wp_cache_delete( 'gutenberg_get_global_settings_custom', 'theme_json' );
 	wp_cache_delete( 'gutenberg_get_global_settings_theme', 'theme_json' );
 	WP_Theme_JSON_Resolver_Gutenberg::clean_cached_data();
 }
@@ -192,6 +201,7 @@ function _gutenberg_clean_theme_json_caches() {
  * The data stored under this cache group:
  *
  * - wp_theme_has_theme_json
+ * - gutenberg_get_global_settings
  * - gutenberg_get_global_stylesheet
  *
  * There is some hooks consumers can use to modify parts

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,15 @@ function gutenberg_get_global_settings( $path = array(), $context = array() ) {`
`171`	`171`	`$origin = 'theme';`
`172`	`172`	`}`
`173`	`173`
`174`		`- $settings = WP_Theme_JSON_Resolver_Gutenberg::get_merged_data( $origin )->get_settings();`
	`174`	`+ $cache_group = 'theme_json';`
	`175`	`+ $cache_key = 'gutenberg_get_global_settings_' . $origin;`
	`176`	`+ $settings = wp_cache_get( $cache_key, $cache_group );`
	`177`	`+`
	`178`	`+ if ( false === $settings \|\| WP_DEBUG ) {`
	`179`	`+ $settings = WP_Theme_JSON_Resolver_Gutenberg::get_merged_data( $origin )->get_settings();`
	`180`	`+ wp_cache_set( $cache_key, $settings, $cache_group );`
	`181`	`+ }`
	`182`	`+`
`175`	`183`	`return _wp_array_get( $settings, $path, $settings );`
`176`	`184`	`}`
`177`	`185`
`@@ -183,6 +191,7 @@ function gutenberg_get_global_settings( $path = array(), $context = array() ) {`
`183`	`191`	`function _gutenberg_clean_theme_json_caches() {`
`184`	`192`	`wp_cache_delete( 'wp_theme_has_theme_json', 'theme_json' );`
`185`	`193`	`wp_cache_delete( 'gutenberg_get_global_stylesheet', 'theme_json' );`
	`194`	`+ wp_cache_delete( 'gutenberg_get_global_settings_custom', 'theme_json' );`
`186`	`195`	`wp_cache_delete( 'gutenberg_get_global_settings_theme', 'theme_json' );`
`187`	`196`	`WP_Theme_JSON_Resolver_Gutenberg::clean_cached_data();`
`188`	`197`	`}`
`@@ -192,6 +201,7 @@ function _gutenberg_clean_theme_json_caches() {`
`192`	`201`	`* The data stored under this cache group:`
`193`	`202`	`*`
`194`	`203`	`* - wp_theme_has_theme_json`
	`204`	`+ * - gutenberg_get_global_settings`
`195`	`205`	`* - gutenberg_get_global_stylesheet`
`196`	`206`	`*`
`197`	`207`	`* There is some hooks consumers can use to modify parts`