Changeset 17576 for trunk/wp-admin/includes/file.php

Timestamp:

03/31/2011 01:28:36 PM (14 years ago)

Author:

dd32

Message:

Be a party-pooper; No more Akismet Dancing upon upgrade; Respect custom WP_CONTENT_DIR for bundled plugins/theme installation; Respect custom WP_CONTENT_DIR/WP_LANG_DIR for Language files when upgrading; Standardise WP_Filesystem path method returns (They're trailing slash'd). Adds an exclusion list to copy_dir() as well as WP_Filesystem_Base::wp_lang_dir(). See #14484 See #11495

File:

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

trunk/wp-admin/includes/file.php

@@ -717 +717 @@
  * @param string $from source directory
  * @param string $to destination directory
+ * @param array $skip_list a list of files/folders to skip copying
  * @return mixed WP_Error on failure, True on success.
  */
-function copy_dir($from, $to) {
+function copy_dir($from, $to, $skip_list = array() ) {
     global $wp_filesystem;
 
@@ -727 +728 @@
     $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 ( 'f' == $fileinfo['type'] ) {
             if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true, FS_CHMOD_FILE) ) {
@@ -740 +752 @@
                     return new WP_Error('mkdir_failed', __('Could not create directory.'), $to . $filename);
             }
-            $result = copy_dir($from . $filename, $to . $filename);
+            $result = copy_dir($from . $filename, $to . $filename, $skip_list);
             if ( is_wp_error($result) )
                 return $result;