Ticket #14028: 14028.2.diff

src/wp-admin/includes/class-wp-upgrader.php

@@ -1532 +1532 @@
 
                 foreach ( $checksums as $file => $checksum ) {
                         // Skip files which get updated
-                        if ( 'wp-content' == substr( $file, 0, 10 ) )
+                        if ( 'wp-content' == substr( $file, 0, 10 ) || 'readme.html' == $file )
                                 continue;
                         if ( ! file_exists( ABSPATH . $file ) || md5_file( ABSPATH . $file ) !== $checksum )
                                 return false;

src/wp-admin/includes/update.php

@@ -364 +364 @@
                  * This flag is cleared whenever a successful update occurs using Core_Upgrader.
                  */
                 $comparison = ! empty( $failed['critical'] ) ? '>=' : '>';
-                if ( version_compare( $failed['attempted'], $wp_version, '>=' ) )
-                        $nag = true;
+                if ( version_compare( $failed['attempted'], $wp_version, $comparison ) ) {
+                        require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
+                        $upgrader = new Core_Upgrader;
+
+                        if ( $upgrader->check_files() )
+                                delete_site_option( 'auto_core_update_failed' );
+                        else
+                                $nag = true;
+                }
         }
 
         if ( ! $nag )