WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Andrew Ozz 2019-06-13 16:05:52 +00:00
parent 70a8322fd3
commit 5d7e433b1d
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-admin/includes/update.php
View File

@ -841,10 +841,20 @@ function wp_recovery_mode_nag() {
return; 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"> <div class="notice notice-info">
<p> <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> </p>
</div> </div>
<?php <?php

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.