sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correct the ZipArchive opening test logic. See #13491 

git-svn-id: https://develop.svn.wordpress.org/trunk@14800 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Dion Hulse 2010-05-22 05:09:08 +00:00
parent 6d0ed6f1ea
commit d0a1400321
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/includes/file.php
View File

@ -585,7 +585,7 @@ function _unzip_file_ziparchive($file, $to, $needed_dirs = array() ) {
// PHP4-compat - php4 classes can't contain constants // PHP4-compat - php4 classes can't contain constants
$zopen = $z->open($file, /* ZIPARCHIVE::CHECKCONS */ 4); $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 && /* ZIPARCHIVE::ZIP_ER_OK */ 0 !== $zopen ) // may return true, or (int)0 ZIP_ER_OK under certain versions
return new WP_Error('incompatible_archive', __('Incompatible Archive.')); return new WP_Error('incompatible_archive', __('Incompatible Archive.'));
for ( $i = 0; $i < $z->numFiles; $i++ ) { for ( $i = 0; $i < $z->numFiles; $i++ ) {
@ -1004,4 +1004,4 @@ foreach ( (array) $extra_fields as $field ) {
return false; return false;
} }
?> ?>