Changeset 25056

Timestamp:

08/20/2013 06:23:48 AM (13 years ago)

Author:

dd32

Message:

Check to see if mbstring.func_overload is configured to affect string functions before switching charsets. Props SergeyBiryukov. Fixes #25063

File:

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

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

@@ -668 +668 @@
 
     // 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') ) {
+    if ( ( ini_get('mbstring.func_overload') & 2 ) && function_exists('mb_internal_encoding') ) {
         $previous_encoding = mb_internal_encoding();
         mb_internal_encoding('ISO-8859-1');