Changeset 25347

Timestamp:

09/11/2013 08:08:35 AM (13 years ago)

Author:

dd32

Message:

Switch unzip_file() over to using the mbstring.func_override helper functions. See #25259

File:

• trunk/src/wp-admin/includes/file.php (modified) (2 diffs)

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

@@ -643 +643 @@
         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') & 2 ) && function_exists('mb_internal_encoding') ) {
-                $previous_encoding = mb_internal_encoding();
-                mb_internal_encoding('ISO-8859-1');
-        }
+        mbstring_binary_safe_encoding();
 
         require_once(ABSPATH . 'wp-admin/includes/class-pclzip.php');
@@ -655 +651 @@
         $archive_files = $archive->extract(PCLZIP_OPT_EXTRACT_AS_STRING);
 
-        if ( isset($previous_encoding) )
-                mb_internal_encoding($previous_encoding);
+        reset_mbstring_encoding();
 
         // Is the archive valid?