Changeset 25801 for trunk/src/wp-admin/includes/update-core.php

Timestamp:

10/15/2013 11:02:28 PM (12 years ago)

Author:

nacin

Message:

Significantly simplify get_core_checksums(), as the caching and chunking was causing too much grief.

Make sure we only do our pre-flight is_writable check when the file exists.

see #18201. see #22704.

File:

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

trunk/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' ) ) {
-        $checksums = get_core_checksums( $wp_version );
-        if ( ! empty( $checksums[ $wp_version ] ) && is_array( $checksums[ $wp_version ] ) ) {
-            foreach( $checksums[ $wp_version ] as $file => $checksum ) {
+        $checksums = get_core_checksums( $wp_version, isset( $wp_local_package ) ? $wp_local_package : 'en_US' );
+        if ( is_array( current( $checksums ) ) ) // Compat code for 3.7-beta2
+            $checksums = current( $checksums );
+        if ( is_array( $checksums ) ) {
+            foreach( $checksums as $file => $checksum ) {
                 if ( 'wp-content' == substr( $file, 0, 10 ) )
                     continue;
-                if ( file_exists( ABSPATH . $file ) && md5_file( ABSPATH . $file ) === $checksum )
+                if ( ! file_exists( ABSPATH . $file ) )
+                    continue;
+                if ( md5_file( ABSPATH . $file ) === $checksum )
                     $skip[] = $file;
                 else
@@ -746 +750 @@
     $skip = array( 'wp-content' );
     $failed = array();
-    if ( ! empty( $checksums[ $wp_version ] ) && is_array( $checksums[ $wp_version ] ) ) {
-        foreach ( $checksums[ $wp_version ] as $file => $checksum ) {
+    if ( is_array( $checksums ) ) {
+        foreach ( $checksums as $file => $checksum ) {
             if ( 0 === strpos( $file, 'wp-content' ) )
                 continue;