Changeset 13221

Timestamp:

02/19/2010 10:59:32 AM (15 years ago)

Author:

dd32

Message:

Fallback to PclZip in the event that ZipArchive cannot handle a given archive properly. Close the Zip handle when we're done as well. Fixes #12230

File:

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

trunk/wp-admin/includes/file.php

@@ -529 +529 @@
     }
 
-    if ( class_exists('ZipArchive') && apply_filters('unzip_file_use_ziparchive', true ) )
-        return _unzip_file_ziparchive($file, $to, $needed_dirs);
-    else
-        return _unzip_file_pclzip($file, $to, $needed_dirs);
+    if ( class_exists('ZipArchive') && apply_filters('unzip_file_use_ziparchive', true ) ) {
+        $result = _unzip_file_ziparchive($file, $to, $needed_dirs);
+        if ( true === $result ) {
+            return $result;
+        } elseif ( is_wp_error($result) ) {
+            if ( 'incompatible_archive' != $result->get_error_code() )
+                return $result;
+        }
+        echo "fall through to pcl";
+    }
+    // Fall through to PclZip if ZipArchive is not available, or encountered an error opening the file.
+    return _unzip_file_pclzip($file, $to, $needed_dirs);
 }
 
@@ -591 +599 @@
             return new WP_Error('copy_failed', __('Could not copy file.'), $to . $file['filename']);
     }
+
+    $z->close();
 
     return true;