Ticket #45202: 45202.diff

wp-admin/update-core.php

@@ -177 +177 @@
         $wp_version = get_bloginfo( 'version' );
         $updates    = get_core_updates();
 
-        if ( ! isset( $updates[0]->response ) || 'latest' == $updates[0]->response ) {
+        if ( ! isset( $updates[0]->response ) || 'latest' === $updates[0]->response ) {
                 echo '<h2>';
                 _e( 'You have the latest version of WordPress.' );
 
                 if ( wp_http_supports( array( 'ssl' ) ) ) {
                         require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
-                        $upgrader            = new WP_Automatic_Updater;
+                        $upgrader            = new WP_Automatic_Updater();
                         $future_minor_update = (object) array(
                                 'current'       => $wp_version . '.1.next.minor',
                                 'version'       => $wp_version . '.1.next.minor',
@@ -196 +196 @@
                         }
                 }
                 echo '</h2>';
-        } else {
+        }
+
+        if ( isset( $updates[0]->version ) && version_compare( $updates[0]->version, $wp_version, '>' ) ) {
                 echo '<div class="notice notice-warning"><p>';
                 _e( '<strong>Important:</strong> Before updating, please <a href="https://codex.wordpress.org/WordPress_Backups">back up your database and files</a>. For help with updates, visit the <a href="https://codex.wordpress.org/Updating_WordPress">Updating WordPress</a> Codex page.' );
                 echo '</p></div>';
@@ -206 +208 @@
                 echo '</h2>';
         }
 
-        if ( isset( $updates[0] ) && $updates[0]->response == 'development' ) {
+        if ( isset( $updates[0] ) && 'development' === $updates[0]->response ) {
                 require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
-                $upgrader = new WP_Automatic_Updater;
+                $upgrader = new WP_Automatic_Updater();
                 if ( wp_http_supports( 'ssl' ) && $upgrader->should_update( 'core', $updates[0], ABSPATH ) ) {
                         echo '<div class="updated inline"><p>';
                         echo '<strong>' . __( 'BETA TESTERS:' ) . '</strong> ' . __( 'This site is set up to install updates of future beta versions automatically.' );
@@ -224 +226 @@
         }
         echo '</ul>';
         // 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' ) ) {
+        if ( $updates && ( count( $updates ) > 1 || 'latest' !== $updates[0]->response ) ) {
                 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>';
         } elseif ( ! $updates ) {
                 list( $normalized_version ) = explode( '-', $wp_version );