From 4c3d541e231d85efa2f0bc3fefaeb04f4f27c06f Mon Sep 17 00:00:00 2001
From: Gary Pendergast <gary@pento.net>
Date: Thu, 11 Jul 2019 06:01:58 +0000
Subject: [PATCH] Block Editor: Fix the link to the classic editor when
 incompatible meta boxen are detected.

Props tmatsuur, mukesh27.
Fixes #45935.

Built from https://develop.svn.wordpress.org/trunk@45618


git-svn-id: http://core.svn.wordpress.org/trunk@45429 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/template.php | 8 +++++++-
 wp-includes/version.php        | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 3d4c1aacf5..6c83001e9a 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -1122,7 +1122,13 @@ function do_block_editor_incompatible_meta_box( $object, $box ) {
 			echo '</p>';
 		}
 	} elseif ( $object instanceof WP_Post ) {
-		$edit_url = add_query_arg( 'classic-editor', '', get_edit_post_link( $object ) );
+		$edit_url = add_query_arg(
+			array(
+				'classic-editor'         => '',
+				'classic-editor__forget' => '',
+			),
+			get_edit_post_link( $object )
+		);
 		echo '<p>';
 		/* translators: %s: A link to use the Classic Editor plugin. */
 		printf( __( 'Please open the <a href="%s">classic editor</a> to use this meta box.' ), esc_url( $edit_url ) );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index cd737318a3..80f4b7e61b 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.3-alpha-45617';
+$wp_version = '5.3-alpha-45618';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.