Skip to content

Fix GitHub Actions failure due to duplicate functions #44052

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
noisysocks merged 3 commits into from
Sep 12, 2022
Merged

Fix GitHub Actions failure due to duplicate functions #44052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7bee925
Add redeclaration check of `wp_add_global_styles_for_blocks`
t-hamano Sep 10, 2022
e74631d
Add skip redirection
t-hamano Sep 10, 2022
787f6cd
Use gutenberg_ prefix
t-hamano Sep 12, 2022
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
2 changes: 1 addition & 1 deletion lib/compat/wordpress-6.1/get-global-styles-and-settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
/**
* Adds global style rules to the inline style for each block.
*/
function wp_add_global_styles_for_blocks() {
function gutenberg_add_global_styles_for_blocks() {
$tree = WP_Theme_JSON_Resolver_Gutenberg::get_merged_data();
$block_nodes = $tree->get_styles_block_nodes();
foreach ( $block_nodes as $metadata ) {
Expand Down
2 changes: 1 addition & 1 deletion lib/compat/wordpress-6.1/script-loader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ function gutenberg_enqueue_global_styles() {
wp_enqueue_style( 'global-styles' );

// add each block as an inline css.
wp_add_global_styles_for_blocks();
gutenberg_add_global_styles_for_blocks();
}

remove_action( 'wp_enqueue_scripts', 'wp_enqueue_global_styles' );
Expand Down