Changeset 44249

Timestamp:

12/17/2018 12:14:27 AM (7 years ago)

Author:

SergeyBiryukov

Message:

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.

Location:

trunk

Files:

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

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

@@ -2471 +2471 @@
     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;
     }
@@ -2505 +2505 @@
     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();