From 98968ae2fc5bc1cdedda86e683d595e2015019b4 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Mon, 17 Dec 2018 00:14:27 +0000 Subject: [PATCH] Scripts: Fix a PHP error in admin-ajax calls. When making an ajax request, `wp_enqueue_registered_block_scripts_and_styles()` checked if `is_admin()` was true before accessing `$current_screen`, rather than checking if `$current_screen` was defined. This is usually fine, execept for in ajax requests. Props ocean90, foreverpinetree, pento. Merges [43893] and [43894] to trunk. Fixes #45302. git-svn-id: https://develop.svn.wordpress.org/trunk@44249 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/script-loader.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php index 4915c2ba98..6a3cf7d5e5 100644 --- a/src/wp-includes/script-loader.php +++ b/src/wp-includes/script-loader.php @@ -2470,7 +2470,7 @@ function script_concat_settings() { function wp_common_block_scripts_and_styles() { global $current_screen; - if ( is_admin() && ! $current_screen->is_block_editor() ) { + if ( is_admin() && ( $current_screen instanceof WP_Screen ) && ! $current_screen->is_block_editor() ) { return; } @@ -2504,7 +2504,7 @@ function wp_common_block_scripts_and_styles() { function wp_enqueue_registered_block_scripts_and_styles() { global $current_screen; - $is_editor = ( is_admin() && $current_screen->is_block_editor() ); + $is_editor = ( ( $current_screen instanceof WP_Screen ) && $current_screen->is_block_editor() ); $block_registry = WP_Block_Type_Registry::get_instance(); foreach ( $block_registry->get_all_registered() as $block_name => $block_type ) {