WordPress.org

Make WordPress Core

Changeset 51309


Ignore:
Timestamp:
07/02/2021 06:46:58 PM (3 months ago)
Author:
desrosj
Message:

Editor: Ensure global styles are loaded in the footer when loading core assets individually.

This fixes the logic in wp_enqueue_global_styles() to ensure that global styles are loaded in the footer when a site opts-in to loading Core block assets individually.

This fixes a bug where styles defined in themes.json are not respected.

Props walbo, nosolosw, mcsf, aristath, desrosj.
Fixes #53494.

Location:
trunk/src/wp-includes
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/default-filters.php

    r51284 r51309  
    555555add_action( 'wp_enqueue_scripts', 'wp_localize_jquery_ui_datepicker', 1000 );
    556556add_action( 'wp_enqueue_scripts', 'wp_common_block_scripts_and_styles' );
    557 add_action( 'wp_enqueue_scripts', 'wp_enqueue_global_styles' );
    558557add_action( 'admin_enqueue_scripts', 'wp_localize_jquery_ui_datepicker', 1000 );
    559558add_action( 'admin_enqueue_scripts', 'wp_common_block_scripts_and_styles' );
     
    569568add_filter( 'customize_controls_print_styles', 'wp_resource_hints', 1 );
    570569
     570// Global styles can be enqueued in both the header and the footer. See https://core.trac.wordpress.org/ticket/53494.
     571add_action( 'wp_enqueue_scripts', 'wp_enqueue_global_styles' );
     572add_action( 'wp_footer', 'wp_enqueue_global_styles', 1 );
     573
    571574add_action( 'wp_default_styles', 'wp_default_styles' );
    572575add_filter( 'style_loader_src', 'wp_style_loader_src', 10, 2 );
  • trunk/src/wp-includes/script-loader.php

    r51263 r51309  
    22682268    }
    22692269
     2270    $separate_assets = wp_should_load_separate_core_block_assets();
     2271
     2272    /*
     2273     * Global styles should be printed in the head when loading all styles combined.
     2274     * The footer should only be used to print global styles for classic themes with separate core assets enabled.
     2275     *
     2276     * See https://core.trac.wordpress.org/ticket/53494.
     2277     */
     2278    if ( ( ! $separate_assets && doing_action( 'wp_footer' ) ) || ( $separate_assets && doing_action( 'wp_enqueue_scripts' ) ) ) {
     2279        return;
     2280    }
     2281
    22702282    $can_use_cache = (
    22712283        ( ! defined( 'WP_DEBUG' ) || ! WP_DEBUG ) &&
Note: See TracChangeset for help on using the changeset viewer.