Skip to content

Avoid enqueuing global styles twice when running on WordPress 5.8 #32372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oandregal merged 2 commits into from
Jun 1, 2021
Merged

Avoid enqueuing global styles twice when running on WordPress 5.8 #32372

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa6e0fa
Deregister core styles in the front
oandregal Jun 1, 2021
d463baf
Refactor to reuse global-styles handle
oandregal Jun 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions lib/global-styles.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,13 @@ function gutenberg_experimental_global_styles_enqueue_assets() {
return;
}

wp_register_style( 'global-styles', false, array(), true, true );
wp_add_inline_style( 'global-styles', $stylesheet );
wp_enqueue_style( 'global-styles' );
if ( isset( wp_styles()->registered['global-styles'] ) ) {
wp_styles()->registered['global-styles']->extra['after'][0] = $stylesheet;
Copy link
Member Author

@oandregal oandregal Jun 1, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This only overwrites the first element, which represents styles that come from WordPress core, so it preservess any other styles that may have been registered after.

} else {
wp_register_style( 'global-styles', false, array(), true, true );
wp_add_inline_style( 'global-styles', $stylesheet );
wp_enqueue_style( 'global-styles' );
}
}

/**
Expand Down