Changeset 51309

Timestamp:

07/02/2021 06:46:58 PM (3 years 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:

• default-filters.php (modified) (2 diffs)
• script-loader.php (modified) (1 diff)

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

@@ -555 +555 @@
 add_action( 'wp_enqueue_scripts', 'wp_localize_jquery_ui_datepicker', 1000 );
 add_action( 'wp_enqueue_scripts', 'wp_common_block_scripts_and_styles' );
-add_action( 'wp_enqueue_scripts', 'wp_enqueue_global_styles' );
 add_action( 'admin_enqueue_scripts', 'wp_localize_jquery_ui_datepicker', 1000 );
 add_action( 'admin_enqueue_scripts', 'wp_common_block_scripts_and_styles' );
@@ -569 +568 @@
 add_filter( 'customize_controls_print_styles', 'wp_resource_hints', 1 );
 
+// Global styles can be enqueued in both the header and the footer. See https://core.trac.wordpress.org/ticket/53494.
+add_action( 'wp_enqueue_scripts', 'wp_enqueue_global_styles' );
+add_action( 'wp_footer', 'wp_enqueue_global_styles', 1 );
+
 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

@@ -2268 +2268 @@
     }
 
+    $separate_assets = wp_should_load_separate_core_block_assets();
+
+    /*
+     * Global styles should be printed in the head when loading all styles combined.
+     * The footer should only be used to print global styles for classic themes with separate core assets enabled.
+     *
+     * See https://core.trac.wordpress.org/ticket/53494.
+     */
+    if ( ( ! $separate_assets && doing_action( 'wp_footer' ) ) || ( $separate_assets && doing_action( 'wp_enqueue_scripts' ) ) ) {
+        return;
+    }
+
     $can_use_cache = (
         ( ! defined( 'WP_DEBUG' ) || ! WP_DEBUG ) &&