Changeset 27882

Timestamp:

04/01/2014 03:08:47 AM (11 years ago)

Author:

nacin

Message:

When checking filesystem permissions for core updates, only check the permissions of the files which we need to alter.

Merges [26014] from 3.8 to the 3.7 branch.

fixes #25771.

Location:

branches/3.7

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/update-core.php (modified) (4 diffs)

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

@@ -698 +698 @@
     // 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 ] ) )
@@ -706 +709 @@
                     continue;
                 if ( ! file_exists( ABSPATH . $file ) )
+                    continue;
+                if ( ! file_exists( $working_dir_local . $file ) )
                     continue;
                 if ( md5_file( ABSPATH . $file ) === $checksum )
@@ -753 +758 @@
     if ( isset( $checksums ) && is_array( $checksums ) ) {
         foreach ( $checksums as $file => $checksum ) {
-            if ( 0 === strpos( $file, 'wp-content' ) )
+            if ( 'wp-content' == substr( $file, 0, 10 ) )
                 continue;
-
+            if ( ! file_exists( $working_dir_local . $file ) )
+                continue;
             if ( file_exists( ABSPATH . $file ) && md5_file( ABSPATH . $file ) == $checksum )
                 $skip[] = $file;
@@ -766 +772 @@
     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 ) )