Make WordPress Core

Changeset 52768


Ignore:
Timestamp:
02/17/2022 08:43:39 PM (2 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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/block-supports/duotone.php

    r52757 r52768  
    585585);
    586586add_filter( 'render_block', 'wp_render_duotone_support', 10, 2 );
    587 
    588 /**
    589  * Render the SVG filters supplied by theme.json.
    590  *
    591  * Note that this doesn't render the per-block user-defined
    592  * filters which are handled by wp_render_duotone_support,
    593  * but it should be rendered in the same location as those to satisfy
    594  * Safari's rendering quirks.
    595  *
    596  * @since 5.9.1
    597  */
    598 function wp_global_styles_render_svg_filters() {
    599     $filters = wp_get_global_styles_svg_filters();
    600     if ( ! empty( $filters ) ) {
    601         echo $filters;
    602     }
    603 }
    604 add_action( 'wp_body_open', 'wp_global_styles_render_svg_filters' );
  • trunk/src/wp-includes/default-filters.php

    r52593 r52768  
    575575add_action( 'wp_footer', 'wp_enqueue_global_styles', 1 );
    576576
     577// SVG filters like duotone have to be loaded at the beginning of the body in both admin and the front-end.
     578add_action( 'wp_body_open', 'wp_global_styles_render_svg_filters' );
     579add_action( 'in_admin_header', 'wp_global_styles_render_svg_filters' );
     580
    577581add_action( 'wp_default_styles', 'wp_default_styles' );
    578582add_filter( 'style_loader_src', 'wp_style_loader_src', 10, 2 );
  • trunk/src/wp-includes/script-loader.php

    r52754 r52768  
    23382338
    23392339/**
     2340 * Render the SVG filters supplied by theme.json.
     2341 *
     2342 * Note that this doesn't render the per-block user-defined
     2343 * filters which are handled by wp_render_duotone_support,
     2344 * but it should be rendered before the filtered content
     2345 * in the body to satisfy Safari's rendering quirks.
     2346 *
     2347 * @since 5.9.1
     2348 */
     2349function wp_global_styles_render_svg_filters() {
     2350    /*
     2351     * When calling via the in_admin_header action, we only want to render the
     2352     * SVGs on block editor pages.
     2353     */
     2354    if (
     2355        is_admin() &&
     2356        ! get_current_screen()->is_block_editor()
     2357    ) {
     2358        return;
     2359    }
     2360
     2361    $filters = wp_get_global_styles_svg_filters();
     2362    if ( ! empty( $filters ) ) {
     2363        echo $filters;
     2364    }
     2365}
     2366
     2367/**
    23402368 * Checks if the editor scripts and styles for all registered block types
    23412369 * should be enqueued on the current screen.
Note: See TracChangeset for help on using the changeset viewer.