Ticket #46195: 46195.2.diff

src/wp-admin/edit-form-blocks.php

@@ -23 +23 @@
  */
 global $post_type, $post_type_object, $post, $title, $editor_styles, $wp_meta_boxes;
 
-// Flag that we're loading the block editor.
 $current_screen = get_current_screen();
-$current_screen->is_block_editor( true );
 
 /*
  * Emoji replacement is disabled for now, until it plays nicely with React.

src/wp-admin/includes/class-wp-screen.php

@@ -202 +202 @@
                         return $hook_name;
                 }
 
-                $post_type = $taxonomy = null;
-                $in_admin  = false;
-                $action    = '';
+                $post_type       = $taxonomy = null;
+                $in_admin        = false;
+                $action          = '';
+                $is_block_editor = false;
 
                 if ( $hook_name ) {
                         $id = $hook_name;
@@ -293 +294 @@
                                         if ( $post_id ) {
                                                 $post = get_post( $post_id );
                                                 if ( $post ) {
-                                                        $post_type = $post->post_type;
+                                                        $post_type       = $post->post_type;
+                                                        $is_block_editor = use_block_editor_for_post( $post );
                                                 }
+                                        } else {
+                                                if ( null === $post_type ) {
+                                                        $post_type = 'post';
+                                                }
+                                                $is_block_editor = use_block_editor_for_post_type( $post_type );
                                         }
                                         break;
                                 case 'edit-tags':
@@ -357 +364 @@
                         $screen->id = $id;
                 }
 
-                $screen->base       = $base;
-                $screen->action     = $action;
-                $screen->post_type  = (string) $post_type;
-                $screen->taxonomy   = (string) $taxonomy;
-                $screen->is_user    = ( 'user' == $in_admin );
-                $screen->is_network = ( 'network' == $in_admin );
-                $screen->in_admin   = $in_admin;
+                $screen->base            = $base;
+                $screen->action          = $action;
+                $screen->post_type       = (string) $post_type;
+                $screen->taxonomy        = (string) $taxonomy;
+                $screen->is_user         = ( 'user' == $in_admin );
+                $screen->is_network      = ( 'network' == $in_admin );
+                $screen->in_admin        = $in_admin;
+                $screen->is_block_editor = $is_block_editor;
 
                 self::$_registry[ $id ] = $screen;