Block editor: Cache global stylesheet by theme key.

jorgefilipecosta · jorgefilipecosta · commit 57ad9f16dff3 · 2021-09-16T18:03:04.000Z
Global styles are used in a few different contexts (front, editor, customizer, the theme directory). In the last two contexts, it's important that switching themes immediately refreshes the global stylesheet, to avoid situations in which the styles of the previous theme load with the new one. This was brought up at WordPress/gutenberg#34531 (customizer) and at meta.trac.wordpress.org/ticket/5818 (theme directory). This commit makes sure the stylesheet is regenerated upon switching themes. Props oandregal, dd32. See #53175. git-svn-id: https://develop.svn.wordpress.org/trunk@51819 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php
@@ -2300,8 +2300,9 @@ function wp_enqueue_global_styles() {
 	);
 
 	$stylesheet = null;
+	$transient_name = 'global_styles_' . get_stylesheet();
 	if ( $can_use_cache ) {
-		$cache = get_transient( 'global_styles' );
+		$cache = get_transient( $transient_name );
 		if ( $cache ) {
 			$stylesheet = $cache;
 		}
@@ -2313,7 +2314,7 @@ function wp_enqueue_global_styles() {
 		$stylesheet = $theme_json->get_stylesheet();
 
 		if ( $can_use_cache ) {
-			set_transient( 'global_styles', $stylesheet, MINUTE_IN_SECONDS );
+			set_transient( $transient_name, $stylesheet, MINUTE_IN_SECONDS );
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -2300,8 +2300,9 @@ function wp_enqueue_global_styles() {`
`2300`	`2300`	`);`
`2301`	`2301`
`2302`	`2302`	`$stylesheet = null;`
	`2303`	`+ $transient_name = 'global_styles_' . get_stylesheet();`
`2303`	`2304`	`if ( $can_use_cache ) {`
`2304`		`- $cache = get_transient( 'global_styles' );`
	`2305`	`+ $cache = get_transient( $transient_name );`
`2305`	`2306`	`if ( $cache ) {`
`2306`	`2307`	`$stylesheet = $cache;`
`2307`	`2308`	`}`
`@@ -2313,7 +2314,7 @@ function wp_enqueue_global_styles() {`
`2313`	`2314`	`$stylesheet = $theme_json->get_stylesheet();`
`2314`	`2315`
`2315`	`2316`	`if ( $can_use_cache ) {`
`2316`		`- set_transient( 'global_styles', $stylesheet, MINUTE_IN_SECONDS );`
	`2317`	`+ set_transient( $transient_name, $stylesheet, MINUTE_IN_SECONDS );`
`2317`	`2318`	`}`
`2318`	`2319`	`}`
`2319`	`2320`