Changeset 45224 for trunk/src/wp-admin/includes/class-wp-screen.php

Timestamp:

04/17/2019 01:55:21 AM (6 years ago)

Author:

desrosj

Message:

Administration: Improve the accuracy of is_block_editor().

Currently, there are a number of scenarios where is_block_editor() (and WP_Screen::is_block_editor) would incorrectly indicate block editor support at different points of the loading process. Most notably, checking is_block_editor when hooking into the current_screen action will always result in false, even when the block editor is being loaded. This is because is_block_editor is not set to true until edit-form-blocks.php is included.

This change adds logic to WP_Screen to ensure the accuracy of is_block_editor on block editor pages earlier in the load process.

While edit screens will now be accurate 100% of the time from current_screen on, there are still a few edge cases where is_block_editor could contain an incorrect value when creating a new post.

Because a WP_Post object is a required parameter for the replace_editor filter and use_block_editor_for_post() function, WP_Screen will fall back to the value returned by use_block_editor_for_post_type() for the post being created. To eliminate these edge cases, the use_block_editor_for_post_type filter can be used to return the appropriate boolean value to indicate support.

Props Chouby, desrosj, aduth, johnbillion.
Fixes #46195.

File:

• trunk/src/wp-admin/includes/class-wp-screen.php (modified) (4 diffs)

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

@@ -203 +203 @@
         }
 
-        $post_type = $taxonomy = null;
-        $in_admin  = false;
-        $action    = '';
+        $post_type       = $taxonomy = null;
+        $in_admin        = false;
+        $action          = '';
+        $is_block_editor = false;
 
         if ( $hook_name ) {
@@ -295 +296 @@
                         if ( $post ) {
                             $post_type = $post->post_type;
+
+                            /** This filter is documented in wp-admin/post.php */
+                            $replace_editor = apply_filters( 'replace_editor', false, $post );
+
+                            if ( ! $replace_editor ) {
+                                $is_block_editor = use_block_editor_for_post( $post );
+                            }
                         }
                     }
@@ -315 +323 @@
                     $post_type = 'post';
                 }
+
+                // When creating a new post, use the default block editor support value for the post type.
+                if ( empty( $post_id ) ) {
+                    $is_block_editor = use_block_editor_for_post_type( $post_type );
+                }
+
                 $id = $post_type;
                 break;
@@ -358 +372 @@
         }
 
-        $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;