Changeset 25801 for trunk/src/wp-admin/includes/class-wp-upgrader.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/class-wp-upgrader.php (modified) (2 diffs)

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

@@ -1252 +1252 @@
         $wp_dir = trailingslashit($wp_filesystem->abspath());
 
-        // Pre-cache the checksums for the versions we care about
-        get_core_checksums( array( $wp_version, $current->version ) );
-
         $partial = true;
         if ( $parsed_args['do_rollback'] )
@@ -1385 +1382 @@
 
     function check_files() {
-        global $wp_version;
-
-        $checksums = get_core_checksums( $wp_version );
-
-        if ( empty( $checksums[ $wp_version ] ) || ! is_array( $checksums[ $wp_version ] ) )
+        global $wp_version, $wp_local_package;
+
+        $checksums = get_core_checksums( $wp_version, isset( $wp_local_package ) ? $wp_local_package : 'en_US' );
+
+        if ( ! is_array( $checksums ) )
             return false;
 
-        foreach ( $checksums[ $wp_version ] as $file => $checksum ) {
+        foreach ( $checksums as $file => $checksum ) {
             // Skip files which get updated
             if ( 'wp-content' == substr( $file, 0, 10 ) )