From ad980384f2ca210742bfa473751a0e2d8b68579d Mon Sep 17 00:00:00 2001 From: Dion Hulse Date: Tue, 20 Aug 2013 06:24:09 +0000 Subject: [PATCH] Check to see if mbstring.func_overload is configured to affect string functions before switching charsets. Props SergeyBiryukov. Fixes #25063 Built from https://develop.svn.wordpress.org/trunk@25056 git-svn-id: http://core.svn.wordpress.org/trunk@25042 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/file.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wp-admin/includes/file.php b/wp-admin/includes/file.php index ca424264bc..8f88de48e9 100644 --- a/wp-admin/includes/file.php +++ b/wp-admin/includes/file.php @@ -667,7 +667,7 @@ function _unzip_file_pclzip($file, $to, $needed_dirs = array()) { 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') ) { + if ( ( ini_get('mbstring.func_overload') & 2 ) && function_exists('mb_internal_encoding') ) { $previous_encoding = mb_internal_encoding(); mb_internal_encoding('ISO-8859-1'); }