Changeset 14349

Timestamp:

05/02/2010 11:24:36 PM (15 years ago)

Author:

dd32

Message:

Skip over MACOSX folders during zip extraction. Props chrisbliss18. Fixes #12637

File:

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

trunk/wp-admin/includes/file.php

@@ -504 +504 @@
 /**
  * Unzip's a specified ZIP file to a location on the Filesystem via the WordPress Filesystem Abstraction.
- * Assumes that WP_Filesystem() has already been called and set up.
+ * Assumes that WP_Filesystem() has already been called and set up. Does not extract a root-level __MACOSX directory, if present.
  *
  * Attempts to increase the PHP Memory limit to 256M before uncompressing,
@@ -585 +585 @@
             return new WP_Error('stat_failed', __('Could not retrieve file from archive.'));
 
+        if ( '__MACOSX/' === substr($info['name'], 0, 9) ) // Skip the OS X-created __MACOSX directory
+            continue;
+
         if ( '/' == substr($info['name'], -1) ) // directory
             $needed_dirs[] = $to . untrailingslashit($info['name']);
@@ -608 +611 @@
             continue;
 
+        if ( '__MACOSX/' === substr($info['name'], 0, 9) ) // Don't extract the OS X-created __MACOSX directory files
+            continue; 
+
         $contents = $z->getFromIndex($i);
         if ( false === $contents )
@@ -649 +655 @@
 
     // Determine any children directories needed (From within the archive)
-    foreach ( $archive_files as $file )
+    foreach ( $archive_files as $file ) {
+        if ( '__MACOSX/' === substr($file['filename'], 0, 9) ) // Skip the OS X-created __MACOSX directory 
+            continue;
+    
         $needed_dirs[] = $to . untrailingslashit( $file['folder'] ? $file['filename'] : dirname($file['filename']) );
+    }
 
     $needed_dirs = array_unique($needed_dirs);
@@ -665 +675 @@
     foreach ( $archive_files as $file ) {
         if ( $file['folder'] )
+            continue;
+
+        if ( '__MACOSX/' === substr($file['filename'], 0, 9) ) // Don't extract the OS X-created __MACOSX directory files
             continue;