alex
/
PhpSpreadsheet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

iconv rather than mbstring for convert encoding

This commit is contained in:
Mark Baker 2013-03-24 21:56:06 +00:00
parent 4779025701
commit d79bdc5b19
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Classes/PHPExcel/Shared/String.php
View File

@ -491,14 +491,14 @@ class PHPExcel_Shared_String
*/ */
public static function ConvertEncoding($value, $to, $from) public static function ConvertEncoding($value, $to, $from)
{ {
if (self::getIsMbstringEnabled()) {
return mb_convert_encoding($value, $to, $from);
}
if (self::getIsIconvEnabled()) { if (self::getIsIconvEnabled()) {
return iconv($from, $to, $value); return iconv($from, $to, $value);
} }
if (self::getIsMbstringEnabled()) {
return mb_convert_encoding($value, $to, $from);
}
if($from == 'UTF-16LE'){ if($from == 'UTF-16LE'){
return self::utf16_decode($value, false); return self::utf16_decode($value, false);
}else if($from == 'UTF-16BE'){ }else if($from == 'UTF-16BE'){