Skip to content

Commit

Permalink
Block editor: Cache global stylesheet by theme key.
Browse files Browse the repository at this point in the history
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.
Built from https://develop.svn.wordpress.org/trunk@51819


git-svn-id: https://core.svn.wordpress.org/trunk@51426 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information
jorgefilipecosta committed Sep 16, 2021
1 parent 8938231 commit a3f75f4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions wp-includes/script-loader.php
Expand Up @@ -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;
}
Expand All @@ -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 );
}
}

Expand Down
2 changes: 1 addition & 1 deletion wp-includes/version.php
Expand Up @@ -16,7 +16,7 @@
*
* @global string $wp_version
*/
$wp_version = '5.9-alpha-51818';
$wp_version = '5.9-alpha-51819';

/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
Expand Down

0 comments on commit a3f75f4

Please sign in to comment.