Changeset 49102

Timestamp:

10/08/2020 01:19:10 AM (4 years ago)

Author:

noisysocks

Message:

Editor: Only call should_load_block_editor_scripts_and_styles on admin screens

Do not call the should_load_block_editor_scripts_and_styles filter on non-admin
screens. This makes it less likely that one will accidentally call
get_current_screen() when it doesn't exist.

Follow-up to [49080].
Props noahtallen.
See #51330.

File:

• trunk/src/wp-includes/script-loader.php (modified) (2 diffs)

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

@@ -2186 +2186 @@
  */
 function wp_common_block_scripts_and_styles() {
-    if ( is_admin() && ! wp_should_load_block_editor_scripts_and_styles() ) {
+    if ( ! wp_should_load_block_editor_scripts_and_styles() ) {
         return;
     }
@@ -2220 +2220 @@
     global $current_screen;
 
+    if ( ! is_admin() ) {
+        return false;
+    }
+
     $is_block_editor_screen = ( $current_screen instanceof WP_Screen ) && $current_screen->is_block_editor();
 
     /**
      * Filters the flag that decides whether or not block editor scripts and
-     * styles are going to be enqueued on the current screen.
+     * styles are going to be enqueued on the current admin screen.
      *
      * @since 5.6.0