Ticket #47070: 47070-option-1.diff

wp-admin/includes/update.php

@@ -86 +86 @@
                 return false;
         }
 
-        include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
+        include_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
 
         $auto_update = false;
-        $upgrader    = new WP_Automatic_Updater;
+        $upgrader    = new WP_Automatic_Updater();
         foreach ( $updates->updates as $update ) {
                 if ( 'autoupdate' != $update->response ) {
                         continue;
@@ -212 +212 @@
 
         $cur = get_preferred_from_update_core();
         if ( ! is_object( $cur ) ) {
-                $cur = new stdClass;
+                $cur = new stdClass();
         }
 
         if ( ! isset( $cur->current ) ) {
@@ -654 +654 @@
  * @return false|void
  */
 function maintenance_nag() {
-        include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version
+        include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version
         global $upgrading;
         $nag = isset( $upgrading );
         if ( ! $nag ) {
@@ -841 +841 @@
                 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
+                        /* translators: %s: Recovery Mode exit link */
+                        printf(
+                                wp_kses_post(
+                                        __( '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>' )
+                                ),
+                                $url
+                        );
+                        ?>
                 </p>
         </div>
         <?php