From 53d19c275c311d4912d136cb3638dafc511a0ef0 Mon Sep 17 00:00:00 2001
From: Aki Hamano <54422211+t-hamano@users.noreply.github.com>
Date: Mon, 12 Sep 2022 10:34:37 +0900
Subject: [PATCH] Fix GitHub Actions failure due to duplicate functions
 (#44052)

* Add redeclaration check of `wp_add_global_styles_for_blocks`

* Add skip redirection

* Use gutenberg_ prefix
---
 lib/compat/wordpress-6.1/get-global-styles-and-settings.php | 2 +-
 lib/compat/wordpress-6.1/script-loader.php                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/compat/wordpress-6.1/get-global-styles-and-settings.php b/lib/compat/wordpress-6.1/get-global-styles-and-settings.php
index 32fde3442577b8..c3b7f2b926e879 100644
--- a/lib/compat/wordpress-6.1/get-global-styles-and-settings.php
+++ b/lib/compat/wordpress-6.1/get-global-styles-and-settings.php
@@ -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 ) {
diff --git a/lib/compat/wordpress-6.1/script-loader.php b/lib/compat/wordpress-6.1/script-loader.php
index 63c84f66075deb..e6a42faf932f8b 100644
--- a/lib/compat/wordpress-6.1/script-loader.php
+++ b/lib/compat/wordpress-6.1/script-loader.php
@@ -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' );