Changeset 25540 for trunk/src/wp-admin/includes/file.php

Timestamp:

09/21/2013 06:48:20 AM (11 years ago)

Author:

dd32

Message:

Upgrader: Perform a MD5 file verification check on the files during upgrade. This ensures that both a Partial upgrade build can be used, and that all the files were copied into place correctly.
Props pento for initial patch. Fixes #18201

File:

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

trunk/src/wp-admin/includes/file.php

@@ -724 +724 @@
     $to = trailingslashit($to);
 
-    $skip_regex = '';
-    foreach ( (array)$skip_list as $key => $skip_file )
-        $skip_regex .= preg_quote($skip_file, '!') . '|';
-
-    if ( !empty($skip_regex) )
-        $skip_regex = '!(' . rtrim($skip_regex, '|') . ')$!i';
-
     foreach ( (array) $dirlist as $filename => $fileinfo ) {
-        if ( !empty($skip_regex) )
-            if ( preg_match($skip_regex, $from . $filename) )
-                continue;
+        if ( in_array( $filename, $skip_list ) )
+            continue;
 
         if ( 'f' == $fileinfo['type'] ) {
@@ -748 +740 @@
                     return new WP_Error('mkdir_failed', __('Could not create directory.'), $to . $filename);
             }
-            $result = copy_dir($from . $filename, $to . $filename, $skip_list);
+
+            // generate the $sub_skip_list for the subdirectory as a sub-set of the existing $skip_list
+            $sub_skip_list = array();
+            foreach ( $skip_list as $skip_item ) {
+                if ( 0 === strpos( $skip_item, $filename . '/' ) )
+                    $sub_skip_list[] = preg_replace( '!^' . preg_quote( $filename, '!' ) . '/!i', '', $skip_item );
+            }
+
+            $result = copy_dir($from . $filename, $to . $filename, $sub_skip_list);
             if ( is_wp_error($result) )
                 return $result;