From da3b4b351eda194e619f2737d33a5137de409c8e Mon Sep 17 00:00:00 2001 From: Dion Hulse Date: Sat, 29 May 2010 13:16:35 +0000 Subject: [PATCH] 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 git-svn-id: https://develop.svn.wordpress.org/trunk@15052 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/includes/file.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wp-admin/includes/file.php b/wp-admin/includes/file.php index 8c7baf0370..cf64b8ca71 100644 --- a/wp-admin/includes/file.php +++ b/wp-admin/includes/file.php @@ -585,7 +585,7 @@ function _unzip_file_ziparchive($file, $to, $needed_dirs = array() ) { // 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.')); for ( $i = 0; $i < $z->numFiles; $i++ ) {