Ticket #45285: get_hidden_meta_boxes-2.diff

wp-admin/edit-form-blocks.php

@@ -296 +296 @@
 
         // Whether or not to load the 'postcustom' meta box is stored as a user meta
         // field so that we're not always loading its assets.
-        'enableCustomFields'     => (bool) get_user_meta( get_current_user_id(), 'enable_custom_fields', true ),
+        'enableCustomFields'     => ! in_array( 'postcustom', get_hidden_meta_boxes( get_current_screen() ) ),
 );
 
 $autosave = wp_get_post_autosave( $post_ID );

wp-admin/includes/meta-boxes.php

@@ -1362 +1362 @@
 
         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 ) ) {
+                if ( ! $screen || ! $screen->is_block_editor() || ! in_array( 'postcustom', get_hidden_meta_boxes( $screen ) ) ) {
                         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 ) );
                 }
         }

wp-admin/includes/post.php

@@ -2143 +2143 @@
          * If the 'postcustom' meta box is enabled, then we need to perform some
          * extra initialization on it.
          */
-        $enable_custom_fields = (bool) get_user_meta( get_current_user_id(), 'enable_custom_fields', true );
+        $enable_custom_fields = ! in_array( 'postcustom', get_hidden_meta_boxes( get_current_screen() ) );
         if ( $enable_custom_fields ) {
                 $script = "( function( $ ) {
                         if ( $('#postcustom').length ) {

wp-admin/post.php

@@ -284 +284 @@
         check_admin_referer( 'toggle-custom-fields' );
 
         $current_user_id = get_current_user_id();
+        $screen = get_current_screen();
         if ( $current_user_id ) {
-                $enable_custom_fields = (bool) get_user_meta( $current_user_id, 'enable_custom_fields', true );
-                update_user_meta( $current_user_id, 'enable_custom_fields', ! $enable_custom_fields );
+                $hidden_meta_boxes = get_hidden_meta_boxes($screen);
+                if ( in_array( 'postcustom', $hidden_meta_boxes ) ) {
+                        unset( $hidden_meta_boxes[ array_search( 'postcustom', $hidden_meta_boxes ) ] );
+                } else {
+                        $hidden_meta_boxes[] = 'postcustom';
+                }
+                update_user_option($current_user_id, "metaboxhidden_" . $screen->id, $hidden_meta_boxes, true);
         }
 
         wp_safe_redirect( wp_get_referer() );