From 5d7e433b1d574a6c600846a6b7b66e56aa490058 Mon Sep 17 00:00:00 2001
From: Andrew Ozz <admin@laptoptips.ca>
Date: Thu, 13 Jun 2019 16:05:52 +0000
Subject: [PATCH] Add a Recovery Mode Exit button to the notice. This fixes it
 in responsive view.

Props desrosj, karmatosed, chetan200891, afercia, afragen, garrett-eclipse.
Merges [45529] to the 5.2 branch.
Fixes #47070.

Built from https://develop.svn.wordpress.org/branches/5.2@45530


git-svn-id: http://core.svn.wordpress.org/branches/5.2@45341 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/update.php | 12 +++++++++++-
 wp-includes/version.php      |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/wp-admin/includes/update.php b/wp-admin/includes/update.php
index 1a4bee003a..5dd9d63b5c 100644
--- a/wp-admin/includes/update.php
+++ b/wp-admin/includes/update.php
@@ -841,10 +841,20 @@ function wp_recovery_mode_nag() {
 		return;
 	}
 
+	$url = wp_login_url();
+	$url = add_query_arg( 'action', WP_Recovery_Mode::EXIT_ACTION, $url );
+	$url = wp_nonce_url( $url, WP_Recovery_Mode::EXIT_ACTION );
+
 	?>
 	<div class="notice notice-info">
 		<p>
-			<?php esc_html_e( 'You are in recovery mode. This means there may be an error with a theme or plugin. To exit recovery mode, log out or use the Exit button.' ); ?>
+			<?php
+			printf(
+				/* translators: %s: Recovery Mode exit link */
+				__( 'You are in recovery mode. This means there may be an error with a theme or plugin. To exit recovery mode, log out or use the Exit button. <a href="%s">Exit Recovery Mode</a>' ),
+				esc_url( $url )
+			);
+			?>
 		</p>
 	</div>
 	<?php
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 8904b1518a..eec3460cce 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.2.2-RC1-45528';
+$wp_version = '5.2.2-RC1-45530';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.