Changeset 52768

Timestamp:

02/17/2022 08:43:39 PM (3 years ago)

Author:

hellofromTonya

Message:

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.

Location:

trunk/src/wp-includes

Files:

• block-supports/duotone.php (modified) (1 diff)
• default-filters.php (modified) (1 diff)
• script-loader.php (modified) (1 diff)

trunk/src/wp-includes/block-supports/duotone.php

@@ -585 +585 @@
 );
 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' );

trunk/src/wp-includes/default-filters.php

@@ -575 +575 @@
 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 );

trunk/src/wp-includes/script-loader.php

@@ -2338 +2338 @@
 
 /**
+ * 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.