diff -r c7c34916027a -r 177826044cd9 wp/wp-admin/post-new.php
--- a/wp/wp-admin/post-new.php	Mon Oct 14 18:06:33 2019 +0200
+++ b/wp/wp-admin/post-new.php	Mon Oct 14 18:28:13 2019 +0200
@@ -18,7 +18,7 @@
 
 if ( ! isset( $_GET['post_type'] ) ) {
 	$post_type = 'post';
-} elseif ( in_array( $_GET['post_type'], get_post_types( array('show_ui' => true ) ) ) ) {
+} elseif ( in_array( $_GET['post_type'], get_post_types( array( 'show_ui' => true ) ) ) ) {
 	$post_type = $_GET['post_type'];
 } else {
 	wp_die( __( 'Invalid post type.' ) );
@@ -26,18 +26,19 @@
 $post_type_object = get_post_type_object( $post_type );
 
 if ( 'post' == $post_type ) {
-	$parent_file = 'edit.php';
+	$parent_file  = 'edit.php';
 	$submenu_file = 'post-new.php';
 } elseif ( 'attachment' == $post_type ) {
-	if ( wp_redirect( admin_url( 'media-new.php' ) ) )
+	if ( wp_redirect( admin_url( 'media-new.php' ) ) ) {
 		exit;
+	}
 } else {
 	$submenu_file = "post-new.php?post_type=$post_type";
 	if ( isset( $post_type_object ) && $post_type_object->show_in_menu && $post_type_object->show_in_menu !== true ) {
 		$parent_file = $post_type_object->show_in_menu;
 		// What if there isn't a post-new.php item for this post type?
 		if ( ! isset( $_registered_pages[ get_plugin_page_hookname( "post-new.php?post_type=$post_type", $post_type_object->show_in_menu ) ] ) ) {
-			if (	isset( $_registered_pages[ get_plugin_page_hookname( "edit.php?post_type=$post_type", $post_type_object->show_in_menu ) ] ) ) {
+			if ( isset( $_registered_pages[ get_plugin_page_hookname( "edit.php?post_type=$post_type", $post_type_object->show_in_menu ) ] ) ) {
 				// Fall back to edit.php for that post type, if it exists
 				$submenu_file = "edit.php?post_type=$post_type";
 			} else {
@@ -62,18 +63,21 @@
 	);
 }
 
-// Schedule auto-draft cleanup
-if ( ! wp_next_scheduled( 'wp_scheduled_auto_draft_delete' ) ) {
-	wp_schedule_event( time(), 'daily', 'wp_scheduled_auto_draft_delete' );
-}
-
-$post = get_default_post_to_edit( $post_type, true );
+$post    = get_default_post_to_edit( $post_type, true );
 $post_ID = $post->ID;
 
 /** This filter is documented in wp-admin/post.php */
 if ( apply_filters( 'replace_editor', false, $post ) !== true ) {
-	wp_enqueue_script( 'autosave' );
-	include( ABSPATH . 'wp-admin/edit-form-advanced.php' );
+	if ( use_block_editor_for_post( $post ) ) {
+		include( ABSPATH . 'wp-admin/edit-form-blocks.php' );
+	} else {
+		wp_enqueue_script( 'autosave' );
+		include( ABSPATH . 'wp-admin/edit-form-advanced.php' );
+	}
+} else {
+	// Flag that we're not loading the block editor.
+	$current_screen = get_current_screen();
+	$current_screen->is_block_editor( false );
 }
 
 include( ABSPATH . 'wp-admin/admin-footer.php' );