Ticket #25771: 25771.diff

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

@@ -697 +697 @@
 
         // Check to see which files don't really need updating - only available for 3.7 and higher
         if ( function_exists( 'get_core_checksums' ) ) {
+                // Find the local version of the working directory
+                $working_dir_local = WP_CONTENT_DIR . '/upgrade/' . basename( $from ) . $distro;
+
                 $checksums = get_core_checksums( $wp_version, isset( $wp_local_package ) ? $wp_local_package : 'en_US' );
                 if ( is_array( $checksums ) && isset( $checksums[ $wp_version ] ) )
                         $checksums = $checksums[ $wp_version ]; // Compat code for 3.7-beta2
@@ -706 +709 @@
                                         continue;
                                 if ( ! file_exists( ABSPATH . $file ) )
                                         continue;
+                                if ( ! file_exists( $working_dir_local . $file ) )
+                                        continue;
                                 if ( md5_file( ABSPATH . $file ) === $checksum )
                                         $skip[] = $file;
                                 else
@@ -765 +770 @@
         // Some files didn't copy properly
         if ( ! empty( $failed ) ) {
                 $total_size = 0;
-                // Find the local version of the working directory
-                $working_dir_local = WP_CONTENT_DIR . '/upgrade/' . basename( $from ) . $distro;
                 foreach ( $failed as $file ) {
                         if ( file_exists( $working_dir_local . $file ) )
                                 $total_size += filesize( $working_dir_local . $file );