Plugin: Account for null return of get_current_screen (#14558)

WordPress · Mar 22, 2019 · 9bcf036 · 9bcf036
1 parent ab136c2
commit 9bcf036
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/gutenberg.php b/gutenberg.php
@@ -93,7 +93,8 @@ function is_gutenberg_page() {
 	_deprecated_function( __FUNCTION__, '5.3.0', 'WP_Screen::is_block_editor' );
 
 	require_once ABSPATH . 'wp-admin/includes/screen.php';
-	return get_current_screen()->is_block_editor();
+	$screen = get_current_screen();
+	return ! is_null( $screen ) && get_current_screen()->is_block_editor();
 }
 
 /**
@@ -159,5 +160,6 @@ function gutenberg_init() {
 	_deprecated_function( __FUNCTION__, '5.3.0' );
 
 	require_once ABSPATH . 'wp-admin/includes/screen.php';
-	return get_current_screen()->is_block_editor();
+	$screen = get_current_screen();
+	return ! is_null( $screen ) && get_current_screen()->is_block_editor();
 }