Changeset 15052

Timestamp:

05/29/2010 01:16:35 PM (14 years ago)

Author:

dd32

Message:

Always fallback to PclZip in the event that ZipArchive does not return true. The PHP Zip extension is hit-and-miss with OSX generated zip files, sometimes 0 will be emitted and extraction will succeed, others it will fail with. Reverts r14346, r14377, partially r14800. See #12637. See #13491

File:

• trunk/wp-admin/includes/file.php (modified) (1 diff)

trunk/wp-admin/includes/file.php

@@ -586 +586 @@
     // PHP4-compat - php4 classes can't contain constants
     $zopen = $z->open($file, /* ZIPARCHIVE::CHECKCONS */ 4);
-    if ( true !== $zopen && /* ZIPARCHIVE::ZIP_ER_OK */ 0 !== $zopen ) // may return true, or (int)0 ZIP_ER_OK under certain versions
+    if ( true !== $zopen )
         return new WP_Error('incompatible_archive', __('Incompatible Archive.'));