Changeset 25820

Timestamp:

10/16/2013 11:05:23 PM (7 years ago)

Author:

nacin

Message:

"Future security updates will be applied automatically." see #22704.

File:

• trunk/src/wp-admin/update-core.php (modified) (4 diffs)

trunk/src/wp-admin/update-core.php

@@ -47 +47 @@
     } else {
         if ( $current ) {
-            $message = sprintf(__('You have the latest version of WordPress. You do not need to update. However, if you want to re-install version %s, you can do so automatically or download the package and re-install manually:'), $version_string);
+            $message = sprintf( __( 'If you need to re-install version %s, you can do so here or download the package and re-install manually:' ), $version_string );
             $submit = __('Re-install Now');
             $form_action = 'update-core.php?action=do-core-reinstall';
@@ -146 +146 @@
         echo '<h3>';
         _e('You have the latest version of WordPress.');
-        echo '</h3>';
 
         if ( wp_http_supports( 'ssl' ) ) {
@@ -158 +157 @@
             $should_auto_update = WP_Automatic_Upgrader::should_auto_update( 'core', $future_minor_update, ABSPATH );
             if ( $should_auto_update )
-                echo '<div class="updated inline"><p>&#10004; &nbsp; This site is set up to install security updates of WordPress automatically. Cool!</p></div>';
-        }
+                echo ' ' . __( 'Future security updates will be applied automatically.' );
+        }
+        echo '</h3>';
     } else {
         echo '<div class="updated inline"><p>';
@@ -184 +184 @@
     }
     echo '</ul>';
-    if ( $updates ) {
+    // Don't show the maintenance mode notice when we are only showing a single re-install option.
+    if ( $updates && ( count( $updates ) > 1 || $updates[0]->response != 'latest' ) ) {
         echo '<p>' . __( 'While your site is being updated, it will be in maintenance mode. As soon as your updates are complete, your site will return to normal.' ) . '</p>';
-    } else {
+    } elseif ( ! $updates ) {
         list( $normalized_version ) = explode( '-', $wp_version );
         echo '<p>' . sprintf( __( '<a href="%s">Learn more about WordPress %s</a>.' ), esc_url( self_admin_url( 'about.php' ) ), $normalized_version ) . '</p>';