diff -r 3d4e9c994f10 -r a86126ab1dd4 wp/wp-admin/post.php
--- a/wp/wp-admin/post.php	Tue Oct 22 16:11:46 2019 +0200
+++ b/wp/wp-admin/post.php	Tue Dec 15 13:49:49 2020 +0100
@@ -9,7 +9,7 @@
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once __DIR__ . '/admin.php';
 
 $parent_file  = 'edit.php';
 $submenu_file = 'edit.php';
@@ -19,17 +19,18 @@
 if ( isset( $_GET['post'] ) && isset( $_POST['post_ID'] ) && (int) $_GET['post'] !== (int) $_POST['post_ID'] ) {
 	wp_die( __( 'A post ID mismatch has been detected.' ), __( 'Sorry, you are not allowed to edit this item.' ), 400 );
 } elseif ( isset( $_GET['post'] ) ) {
-	$post_id = $post_ID = (int) $_GET['post'];
+	$post_id = (int) $_GET['post'];
 } elseif ( isset( $_POST['post_ID'] ) ) {
-	$post_id = $post_ID = (int) $_POST['post_ID'];
+	$post_id = (int) $_POST['post_ID'];
 } else {
-	$post_id = $post_ID = 0;
+	$post_id = 0;
 }
+$post_ID = $post_id;
 
 /**
  * @global string  $post_type
  * @global object  $post_type_object
- * @global WP_Post $post
+ * @global WP_Post $post             Global post object.
  */
 global $post_type, $post_type_object, $post;
 
@@ -48,15 +49,15 @@
 
 if ( isset( $_POST['deletepost'] ) ) {
 	$action = 'delete';
-} elseif ( isset( $_POST['wp-preview'] ) && 'dopreview' == $_POST['wp-preview'] ) {
+} elseif ( isset( $_POST['wp-preview'] ) && 'dopreview' === $_POST['wp-preview'] ) {
 	$action = 'preview';
 }
 
 $sendback = wp_get_referer();
 if ( ! $sendback ||
-	 strpos( $sendback, 'post.php' ) !== false ||
-	 strpos( $sendback, 'post-new.php' ) !== false ) {
-	if ( 'attachment' == $post_type ) {
+	false !== strpos( $sendback, 'post.php' ) ||
+	false !== strpos( $sendback, 'post-new.php' ) ) {
+	if ( 'attachment' === $post_type ) {
 		$sendback = admin_url( 'upload.php' );
 	} else {
 		$sendback = admin_url( 'edit.php' );
@@ -70,11 +71,11 @@
 
 switch ( $action ) {
 	case 'post-quickdraft-save':
-		// Check nonce and capabilities
+		// Check nonce and capabilities.
 		$nonce     = $_REQUEST['_wpnonce'];
 		$error_msg = false;
 
-		// For output of the quickdraft dashboard widget
+		// For output of the Quick Draft dashboard widget.
 		require_once ABSPATH . 'wp-admin/includes/dashboard.php';
 
 		if ( ! wp_verify_nonce( $nonce, 'add-post' ) ) {
@@ -95,6 +96,14 @@
 		$_POST['comment_status'] = get_default_comment_status( $post->post_type );
 		$_POST['ping_status']    = get_default_comment_status( $post->post_type, 'pingback' );
 
+		// Wrap Quick Draft content in the Paragraph block.
+		if ( false === strpos( $_POST['content'], '<!-- wp:paragraph -->' ) ) {
+			$_POST['content'] = sprintf(
+				'<!-- wp:paragraph -->%s<!-- /wp:paragraph -->',
+				str_replace( array( "\r\n", "\r", "\n" ), '<br />', $_POST['content'] )
+			);
+		}
+
 		edit_post();
 		wp_dashboard_quick_press();
 		exit;
@@ -102,16 +111,16 @@
 	case 'postajaxpost':
 	case 'post':
 		check_admin_referer( 'add-' . $post_type );
-		$post_id = 'postajaxpost' == $action ? edit_post() : write_post();
+		$post_id = 'postajaxpost' === $action ? edit_post() : write_post();
 		redirect_post( $post_id );
-		exit();
+		exit;
 
 	case 'edit':
 		$editing = true;
 
 		if ( empty( $post_id ) ) {
 			wp_redirect( admin_url( 'post.php' ) );
-			exit();
+			exit;
 		}
 
 		if ( ! $post ) {
@@ -122,7 +131,7 @@
 			wp_die( __( 'Invalid post type.' ) );
 		}
 
-		if ( ! in_array( $typenow, get_post_types( array( 'show_ui' => true ) ) ) ) {
+		if ( ! in_array( $typenow, get_post_types( array( 'show_ui' => true ) ), true ) ) {
 			wp_die( __( 'Sorry, you are not allowed to edit posts in this post type.' ) );
 		}
 
@@ -130,7 +139,7 @@
 			wp_die( __( 'Sorry, you are not allowed to edit this item.' ) );
 		}
 
-		if ( 'trash' == $post->post_status ) {
+		if ( 'trash' === $post->post_status ) {
 			wp_die( __( 'You can&#8217;t edit this item because it is in the Trash. Please restore it and try again.' ) );
 		}
 
@@ -138,20 +147,20 @@
 			check_admin_referer( 'lock-post_' . $post_id );
 			wp_set_post_lock( $post_id );
 			wp_redirect( get_edit_post_link( $post_id, 'url' ) );
-			exit();
+			exit;
 		}
 
 		$post_type = $post->post_type;
-		if ( 'post' == $post_type ) {
+		if ( 'post' === $post_type ) {
 			$parent_file   = 'edit.php';
 			$submenu_file  = 'edit.php';
 			$post_new_file = 'post-new.php';
-		} elseif ( 'attachment' == $post_type ) {
+		} elseif ( 'attachment' === $post_type ) {
 			$parent_file   = 'upload.php';
 			$submenu_file  = 'upload.php';
 			$post_new_file = 'media-new.php';
 		} else {
-			if ( isset( $post_type_object ) && $post_type_object->show_in_menu && $post_type_object->show_in_menu !== true ) {
+			if ( isset( $post_type_object ) && $post_type_object->show_in_menu && true !== $post_type_object->show_in_menu ) {
 				$parent_file = $post_type_object->show_in_menu;
 			} else {
 				$parent_file = "edit.php?post_type=$post_type";
@@ -167,15 +176,15 @@
 		 *
 		 * @since 4.9.0
 		 *
-		 * @param boolean      Whether to replace the editor. Default false.
-		 * @param object $post Post object.
+		 * @param bool    $replace Whether to replace the editor. Default false.
+		 * @param WP_Post $post    Post object.
 		 */
-		if ( apply_filters( 'replace_editor', false, $post ) === true ) {
+		if ( true === apply_filters( 'replace_editor', false, $post ) ) {
 			break;
 		}
 
 		if ( use_block_editor_for_post( $post ) ) {
-			include( ABSPATH . 'wp-admin/edit-form-blocks.php' );
+			require ABSPATH . 'wp-admin/edit-form-blocks.php';
 			break;
 		}
 
@@ -194,18 +203,18 @@
 			enqueue_comment_hotkeys_js();
 		}
 
-		include( ABSPATH . 'wp-admin/edit-form-advanced.php' );
+		require ABSPATH . 'wp-admin/edit-form-advanced.php';
 
 		break;
 
 	case 'editattachment':
 		check_admin_referer( 'update-post_' . $post_id );
 
-		// Don't let these be changed
+		// Don't let these be changed.
 		unset( $_POST['guid'] );
 		$_POST['post_type'] = 'attachment';
 
-		// Update the thumbnail filename
+		// Update the thumbnail filename.
 		$newmeta          = wp_get_attachment_metadata( $post_id, true );
 		$newmeta['thumb'] = wp_basename( $_POST['thumb'] );
 
@@ -217,14 +226,14 @@
 
 		$post_id = edit_post();
 
-		// Session cookie flag that the post was saved
+		// Session cookie flag that the post was saved.
 		if ( isset( $_COOKIE['wp-saving-post'] ) && $_COOKIE['wp-saving-post'] === $post_id . '-check' ) {
 			setcookie( 'wp-saving-post', $post_id . '-saved', time() + DAY_IN_SECONDS, ADMIN_COOKIE_PATH, COOKIE_DOMAIN, is_ssl() );
 		}
 
-		redirect_post( $post_id ); // Send user on their way while we keep working
+		redirect_post( $post_id ); // Send user on their way while we keep working.
 
-		exit();
+		exit;
 
 	case 'trash':
 		check_admin_referer( 'trash-post_' . $post_id );
@@ -241,13 +250,15 @@
 			wp_die( __( 'Sorry, you are not allowed to move this item to the Trash.' ) );
 		}
 
-		if ( $user_id = wp_check_post_lock( $post_id ) ) {
+		$user_id = wp_check_post_lock( $post_id );
+		if ( $user_id ) {
 			$user = get_userdata( $user_id );
+			/* translators: %s: User's display name. */
 			wp_die( sprintf( __( 'You cannot move this item to the Trash. %s is currently editing.' ), $user->display_name ) );
 		}
 
 		if ( ! wp_trash_post( $post_id ) ) {
-			wp_die( __( 'Error in moving to Trash.' ) );
+			wp_die( __( 'Error in moving the item to Trash.' ) );
 		}
 
 		wp_redirect(
@@ -259,7 +270,7 @@
 				$sendback
 			)
 		);
-		exit();
+		exit;
 
 	case 'untrash':
 		check_admin_referer( 'untrash-post_' . $post_id );
@@ -277,11 +288,11 @@
 		}
 
 		if ( ! wp_untrash_post( $post_id ) ) {
-			wp_die( __( 'Error in restoring from Trash.' ) );
+			wp_die( __( 'Error in restoring the item from Trash.' ) );
 		}
 
 		wp_redirect( add_query_arg( 'untrashed', 1, $sendback ) );
-		exit();
+		exit;
 
 	case 'delete':
 		check_admin_referer( 'delete-post_' . $post_id );
@@ -298,19 +309,19 @@
 			wp_die( __( 'Sorry, you are not allowed to delete this item.' ) );
 		}
 
-		if ( $post->post_type == 'attachment' ) {
+		if ( 'attachment' === $post->post_type ) {
 			$force = ( ! MEDIA_TRASH );
 			if ( ! wp_delete_attachment( $post_id, $force ) ) {
-				wp_die( __( 'Error in deleting.' ) );
+				wp_die( __( 'Error in deleting the attachment.' ) );
 			}
 		} else {
 			if ( ! wp_delete_post( $post_id, true ) ) {
-				wp_die( __( 'Error in deleting.' ) );
+				wp_die( __( 'Error in deleting the item.' ) );
 			}
 		}
 
 		wp_redirect( add_query_arg( 'deleted', 1, $sendback ) );
-		exit();
+		exit;
 
 	case 'preview':
 		check_admin_referer( 'update-post_' . $post_id );
@@ -318,7 +329,7 @@
 		$url = post_preview();
 
 		wp_redirect( $url );
-		exit();
+		exit;
 
 	case 'toggle-custom-fields':
 		check_admin_referer( 'toggle-custom-fields' );
@@ -330,7 +341,7 @@
 		}
 
 		wp_safe_redirect( wp_get_referer() );
-		exit();
+		exit;
 
 	default:
 		/**
@@ -345,6 +356,7 @@
 		do_action( "post_action_{$action}", $post_id );
 
 		wp_redirect( admin_url( 'edit.php' ) );
-		exit();
-} // end switch
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+		exit;
+} // End switch.
+
+require_once ABSPATH . 'wp-admin/admin-footer.php';