Changeset 25648

Timestamp:

09/29/2013 11:07:59 PM (13 years ago)

Author:

dd32

Message:

MD5 file verification: Prevent md5_file() warnings when files don't exist, additionally, don't verify wp-content files as they can be updated separately, as well as WP_CONTENT_DIR being set elsewhere. See #22704 See #18201

Location:

trunk/src/wp-admin/includes

Files:

• class-wp-upgrader.php (modified) (1 diff)
• update-core.php (modified) (1 diff)

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

@@ -1358 +1358 @@
 
                 foreach ( $checksums[ $wp_version ] as $file => $checksum ) {
-                        if ( md5_file( ABSPATH . $file ) !== $checksum )
+                        // Skip files which get updated
+                        if ( 'wp-content' == substr( $file, 0, 10 ) )
+                                continue;
+                        if ( ! file_exists( ABSPATH . $file ) || md5_file( ABSPATH . $file ) !== $checksum )
                                 return false;
                 }

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

@@ -699 +699 @@
                 if ( ! empty( $checksums[ $wp_version ] ) && is_array( $checksums[ $wp_version ] ) ) {
                         foreach( $checksums[ $wp_version ] as $file => $checksum ) {
-                                if ( md5_file( ABSPATH . $file ) === $checksum )
+                                if ( 'wp-content' == substr( $file, 0, 10 ) )
+                                        continue;
+                                if ( file_exists( ABSPATH . $file ) && md5_file( ABSPATH . $file ) === $checksum )
                                         $skip[] = $file;
                         }