From 6b97594e65acb12dae6dc8303b9bcc1c43eb6429 Mon Sep 17 00:00:00 2001
From: Gary Pendergast <gary@pento.net>
Date: Mon, 12 Nov 2018 23:38:47 +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.
See #45203.


Built from https://develop.svn.wordpress.org/branches/5.0@43893


git-svn-id: http://core.svn.wordpress.org/branches/5.0@43722 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/script-loader.php | 4 ++--
 wp-includes/version.php       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index 1e814a324f..b31c0b1700 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -2252,7 +2252,7 @@ function script_concat_settings() {
 function wp_common_block_scripts_and_styles() {
 	global $current_screen;
 
-	if ( is_admin() && ! $current_screen->is_block_editor() ) {
+	if ( ( $current_screen instanceof WP_Screen ) && ! $current_screen->is_block_editor() ) {
 		return;
 	}
 
@@ -2286,7 +2286,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 ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 464f6d4d7a..9d3ad6234b 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.0-beta3-43892';
+$wp_version = '5.0-beta3-43893';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.