Restore the order of actions usually fired in edit-form-advanced.php (#…

…10660)

dbx_post_advanced
add_meta_boxes
add_meta_boxes_{$post_type}
do_meta_boxes
edit_form_advanced
restored before admin_enqueue_scripts instead of after admin_head

gutenberg.php

@@ -213,6 +213,7 @@ function gutenberg_init( $return, $post ) {
 	 * includes/meta-boxes is typically loaded from edit-form-advanced.php.
 	 */
 	require_once ABSPATH . 'wp-admin/includes/meta-boxes.php';
+	gutenberg_collect_meta_box_data();
 
 	require_once ABSPATH . 'wp-admin/admin-header.php';
 	the_gutenberg_project();

lib/register.php

@@ -9,26 +9,6 @@
 	die( 'Silence is golden.' );
 }
 
-/**
- * Set up global variables so that plugins will add meta boxes as if we were
- * using the main editor.
- *
- * @since 1.5.0
- */
-function gutenberg_trick_plugins_into_registering_meta_boxes() {
-	global $pagenow;
-
-	if ( in_array( $pagenow, array( 'post.php', 'post-new.php' ), true ) && ! isset( $_REQUEST['classic-editor'] ) ) {
-		// As early as possible, but after any plugins ( ACF ) that adds meta boxes.
-		add_action( 'admin_head', 'gutenberg_collect_meta_box_data', 99 );
-	}
-}
-// As late as possible, but before any logic that adds meta boxes.
-add_action(
-	'plugins_loaded',
-	'gutenberg_trick_plugins_into_registering_meta_boxes'
-);
-
 /**
  * Collect information about meta_boxes registered for the current post.
  *