Changeset 43893

Timestamp:

11/12/2018 11:37:31 PM (8 years ago)

Author:

pento

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.
See #45203.

File:

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

branches/5.0/src/wp-includes/script-loader.php

@@ -2253 +2253 @@
         global $current_screen;
 
-        if ( is_admin() && ! $current_screen->is_block_editor() ) {
+        if ( ( $current_screen instanceof WP_Screen ) && ! $current_screen->is_block_editor() ) {
                 return;
         }
@@ -2287 +2287 @@
         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();