From a3cbbc419d33777115a0cdd5d694863c13b644da Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Thu, 17 Feb 2022 20:43:39 +0000
Subject: [PATCH] Editor: Automatically apply global styles duotone filters to
 render in post editor.

Global styles duotone filters were not rendering in the post editor. This fixes that by adding `wp_global_styles_render_svg_filters` to the `in_admin_header` so it renders in the body before the editor.

Follow-up [52757].

Props ajlende, abhanonstopnewsuk.
Fixes #55190.

git-svn-id: https://develop.svn.wordpress.org/trunk@52768 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/block-supports/duotone.php | 18 --------------
 src/wp-includes/default-filters.php        |  4 ++++
 src/wp-includes/script-loader.php          | 28 ++++++++++++++++++++++
 3 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/src/wp-includes/block-supports/duotone.php b/src/wp-includes/block-supports/duotone.php
index 992e014dfc..6589f4d150 100644
--- a/src/wp-includes/block-supports/duotone.php
+++ b/src/wp-includes/block-supports/duotone.php
@@ -584,21 +584,3 @@ WP_Block_Supports::get_instance()->register(
 	)
 );
 add_filter( 'render_block', 'wp_render_duotone_support', 10, 2 );
-
-/**
- * Render the SVG filters supplied by theme.json.
- *
- * Note that this doesn't render the per-block user-defined
- * filters which are handled by wp_render_duotone_support,
- * but it should be rendered in the same location as those to satisfy
- * Safari's rendering quirks.
- *
- * @since 5.9.1
- */
-function wp_global_styles_render_svg_filters() {
-	$filters = wp_get_global_styles_svg_filters();
-	if ( ! empty( $filters ) ) {
-		echo $filters;
-	}
-}
-add_action( 'wp_body_open', 'wp_global_styles_render_svg_filters' );
diff --git a/src/wp-includes/default-filters.php b/src/wp-includes/default-filters.php
index 20559dd179..182f94eddf 100644
--- a/src/wp-includes/default-filters.php
+++ b/src/wp-includes/default-filters.php
@@ -574,6 +574,10 @@ add_action( 'admin_head', 'wp_check_widget_editor_deps' );
 add_action( 'wp_enqueue_scripts', 'wp_enqueue_global_styles' );
 add_action( 'wp_footer', 'wp_enqueue_global_styles', 1 );
 
+// SVG filters like duotone have to be loaded at the beginning of the body in both admin and the front-end.
+add_action( 'wp_body_open', 'wp_global_styles_render_svg_filters' );
+add_action( 'in_admin_header', 'wp_global_styles_render_svg_filters' );
+
 add_action( 'wp_default_styles', 'wp_default_styles' );
 add_filter( 'style_loader_src', 'wp_style_loader_src', 10, 2 );
 
diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php
index 0957dce2d7..25615b77a9 100644
--- a/src/wp-includes/script-loader.php
+++ b/src/wp-includes/script-loader.php
@@ -2336,6 +2336,34 @@ function wp_enqueue_global_styles() {
 	wp_enqueue_style( 'global-styles' );
 }
 
+/**
+ * Render the SVG filters supplied by theme.json.
+ *
+ * Note that this doesn't render the per-block user-defined
+ * filters which are handled by wp_render_duotone_support,
+ * but it should be rendered before the filtered content
+ * in the body to satisfy Safari's rendering quirks.
+ *
+ * @since 5.9.1
+ */
+function wp_global_styles_render_svg_filters() {
+	/*
+	 * When calling via the in_admin_header action, we only want to render the
+	 * SVGs on block editor pages.
+	 */
+	if (
+		is_admin() &&
+		! get_current_screen()->is_block_editor()
+	) {
+		return;
+	}
+
+	$filters = wp_get_global_styles_svg_filters();
+	if ( ! empty( $filters ) ) {
+		echo $filters;
+	}
+}
+
 /**
  * Checks if the editor scripts and styles for all registered block types
  * should be enqueued on the current screen.