From 756e06cd94f20a7891106e11b828889c29033500 Mon Sep 17 00:00:00 2001
From: Gary Pendergast <pento@git.wordpress.org>
Date: Thu, 11 Jul 2019 06:00:39 +0000
Subject: [PATCH] Block Editor: Fix the link to the classic editor when
 incompatible meta boxen are detected.

Props tmatsuur, mukesh27.
Fixes #45935.


git-svn-id: https://develop.svn.wordpress.org/trunk@45618 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/template.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/wp-admin/includes/template.php b/src/wp-admin/includes/template.php
index 3d4c1aacf5..6c83001e9a 100644
--- a/src/wp-admin/includes/template.php
+++ b/src/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 ) );