sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Scripts: Fix a PHP error in admin-ajax calls.

Browse Source 
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
This commit is contained in:
Sergey Biryukov 2018-12-17 00:14:27 +00:00
parent 897f8bf3b4
commit 98968ae2fc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wp-includes/script-loader.php
View File

@ -2470,7 +2470,7 @@ function script_concat_settings() {
function wp_common_block_scripts_and_styles() { function wp_common_block_scripts_and_styles() {
global $current_screen; 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; return;
} }
@ -2504,7 +2504,7 @@ function wp_common_block_scripts_and_styles() {
function wp_enqueue_registered_block_scripts_and_styles() { function wp_enqueue_registered_block_scripts_and_styles() {
global $current_screen; 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(); $block_registry = WP_Block_Type_Registry::get_instance();
foreach ( $block_registry->get_all_registered() as $block_name => $block_type ) { foreach ( $block_registry->get_all_registered() as $block_name => $block_type ) {