Changeset 25779

Timestamp:

10/14/2013 09:54:33 PM (12 years ago)

Author:

dd32

Message:

Remove PHP4 compat code from the ZipArchive unzip handler, and pass the failure reason into the WP_Error return.

See #22704

File:

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

trunk/src/wp-admin/includes/file.php

@@ -597 +597 @@
     $z = new ZipArchive();
 
-    // PHP4-compat - php4 classes can't contain constants
-    $zopen = $z->open($file, /* ZIPARCHIVE::CHECKCONS */ 4);
+    $zopen = $z->open( $file, ZIPARCHIVE::CHECKCONS );
     if ( true !== $zopen )
-        return new WP_Error('incompatible_archive', __('Incompatible Archive.'));
+        return new WP_Error( 'incompatible_archive', __( 'Incompatible Archive.' ), array( 'ziparchive_error' => $zopen ) );
 
     $uncompressed_size = 0;