Ticket #45282: 45282.diff

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

@@ -19 +19 @@
  * @global WP_Post      $post
  * @global string       $title
  * @global array        $editor_styles
+ * @global array        $wp_meta_boxes
  */
-global $post_type, $post_type_object, $post, $title, $editor_styles;
+global $post_type, $post_type_object, $post, $title, $editor_styles, $wp_meta_boxes;
 
 if ( ! empty( $post_type_object ) ) {
         $title = $post_type_object->labels->edit_item;
@@ -341 +342 @@
 } )();
 JS;
 
-
-/**
- * Filters the settings to pass to the block editor.
- *
- * @since 5.0.0
- *
- * @param array   $editor_settings Default editor settings.
- * @param WP_Post $post            Post being edited.
- */
-$editor_settings = apply_filters( 'block_editor_settings', $editor_settings, $post );
-
-$script = sprintf(
-        $init_script,
-        $post->post_type,
-        $post->ID,
-        wp_json_encode( $editor_settings ),
-        wp_json_encode( $initial_edits )
-);
-wp_add_inline_script( 'wp-edit-post', $script );
-
 /**
  * Scripts
  */
@@ -397 +378 @@
 /** This action is documented in wp-admin/edit-form-advanced.php */
 do_action( 'edit_form_advanced', $post );
 
+if ( ! isset( $wp_meta_boxes[ $current_screen->id ]['normal']['core']['postcustom'] ) || ( isset( $wp_meta_boxes[ $current_screen->id ]['normal']['core']['postcustom'] ) && ! $wp_meta_boxes[ $current_screen->id ]['normal']['core']['postcustom'] ) ) {
+        unset( $editor_settings['enableCustomFields'] );
+}
+
+/**
+ * Filters the settings to pass to the block editor.
+ *
+ * @since 5.0.0
+ *
+ * @param array   $editor_settings Default editor settings.
+ * @param WP_Post $post            Post being edited.
+ */
+$editor_settings = apply_filters( 'block_editor_settings', $editor_settings, $post );
+
+$script = sprintf(
+        $init_script,
+        $post->post_type,
+        $post->ID,
+        wp_json_encode( $editor_settings ),
+        wp_json_encode( $initial_edits )
+);
+wp_add_inline_script( 'wp-edit-post', $script );
+
 require_once( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 

src/wp-admin/includes/meta-boxes.php

@@ -1361 +1361 @@
                 add_meta_box('trackbacksdiv', __('Send Trackbacks'), 'post_trackback_meta_box', null, 'normal', 'core', array( '__back_compat_meta_box' => true ) );
 
         if ( post_type_supports($post_type, 'custom-fields') ) {
-                $screen = get_current_screen();
-                if ( ! $screen || ! $screen->is_block_editor() || (bool) get_user_meta( get_current_user_id(), 'enable_custom_fields', true ) ) {
-                        add_meta_box('postcustom', __('Custom Fields'), 'post_custom_meta_box', null, 'normal', 'core', array( '__back_compat_meta_box' => false, '__block_editor_compatible_meta_box' => true ) );
-                }
+                $args = array(
+                        '__back_compat_meta_box' => ! (bool) get_user_meta( get_current_user_id(), 'enable_custom_fields', true ),
+                        '__block_editor_compatible_meta_box' => true
+                );
+                add_meta_box('postcustom', __('Custom Fields'), 'post_custom_meta_box', null, 'normal', 'core', $args );
         }
 
         /**

src/wp-admin/includes/template.php

@@ -1076 +1076 @@
                                         }
 
                                         $i++;
-                                        $hidden_class = in_array($box['id'], $hidden) ? ' hide-if-js' : '';
+                                        $hidden_class = ( ! $screen->is_block_editor() && in_array( $box['id'], $hidden ) ) ? ' hide-if-js' : '';
                                         echo '<div id="' . $box['id'] . '" class="postbox ' . postbox_classes($box['id'], $page) . $hidden_class . '" ' . '>' . "\n";
                                         if ( 'dashboard_browser_nag' != $box['id'] ) {
                                                 $widget_title = $box[ 'title' ];