From b7b1584139e3a9d8a303aeb80b76c713cb114446 Mon Sep 17 00:00:00 2001 From: Robert Anderson Date: Thu, 8 Oct 2020 01:19:10 +0000 Subject: [PATCH] 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. git-svn-id: https://develop.svn.wordpress.org/trunk@49102 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/script-loader.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php index e595bf0d28..87e48e6845 100644 --- a/src/wp-includes/script-loader.php +++ b/src/wp-includes/script-loader.php @@ -2185,7 +2185,7 @@ function script_concat_settings() { * @global WP_Screen $current_screen WordPress current screen object. */ 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; } @@ -2219,11 +2219,15 @@ function wp_common_block_scripts_and_styles() { function wp_should_load_block_editor_scripts_and_styles() { 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 *