Changeset 25811

Timestamp:

10/16/2013 03:19:59 PM (13 years ago)

Author:

dd32

Message:

Avoid a few PHP Warnings when files don't exist and use a better method to locate the local filepath.
See #18201

File:

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

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

@@ -755 +755 @@
                                 continue;
 
-                        if ( md5_file( ABSPATH . $file ) == $checksum )
+                        if ( file_exists( ABSPATH . $file ) && md5_file( ABSPATH . $file ) == $checksum )
                                 $skip[] = $file;
                         else
@@ -766 +766 @@
                 $total_size = 0;
                 // Find the local version of the working directory
-                $working_dir_local = str_replace( trailingslashit( $wp_filesystem->wp_content_dir() ), trailingslashit( WP_CONTENT_DIR ), $from . $distro );
-                foreach ( $failed as $file )
-                        $total_size += filesize( $working_dir_local . '/' . $file ); 
+                $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 );
+                }
 
                 // If we don't have enough free space, it isn't worth trying again.