Changeset 51309 for trunk/src/wp-includes/script-loader.php

Timestamp:

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

File:

• trunk/src/wp-includes/script-loader.php (modified) (1 diff)

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 ) &&