Changeset 17592

Timestamp:

04/03/2011 12:32:06 PM (14 years ago)

Author:

dd32

Message:

Set the mb_string internal encoding to ISO-8859-1 whilst uncompressing archives using PclZip. Fixes 'PCLZIP_ERR_BAD_FORMAT (-10) : Invalid block size' errors on systems utilising mbstring.func_overload. Fixes #15789

File:

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

trunk/wp-admin/includes/file.php

@@ -653 +653 @@
     global $wp_filesystem;
 
+    // See #15789 - PclZip uses string functions on binary data, If it's overloaded with Multibyte safe functions the results are incorrect.
+    if ( ini_get('mbstring.func_overload') && function_exists('mb_internal_encoding') ) {
+        $previous_encoding = mb_internal_encoding();
+        mb_internal_encoding('ISO-8859-1');
+    }
+
     require_once(ABSPATH . 'wp-admin/includes/class-pclzip.php');
 
     $archive = new PclZip($file);
 
+    $archive_files = $archive->extract(PCLZIP_OPT_EXTRACT_AS_STRING);
+
+    if ( isset($previous_encoding) )
+        mb_internal_encoding($previous_encoding);
+
     // Is the archive valid?
-    if ( false == ($archive_files = $archive->extract(PCLZIP_OPT_EXTRACT_AS_STRING)) )
+    if ( false === $archive_files )
         return new WP_Error('incompatible_archive', __('Incompatible Archive.'), $archive->errorInfo(true));