geckon01/PhpSpreadsheet
1
0
Fork 0
mirror of https://github.com/PHPOffice/PhpSpreadsheet.git synced 2026-09-16 21:16:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

iconv rather than mbstring for convert encoding

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
Classes/PHPExcel/Shared/String.php
+4 -4
View File
@@ -491,14 +491,14 @@ class PHPExcel_Shared_String
*/
public static function ConvertEncoding($value, $to, $from)
{
if (self::getIsMbstringEnabled()) {
return mb_convert_encoding($value, $to, $from);
}
if (self::getIsIconvEnabled()) {
return iconv($from, $to, $value);
}
if (self::getIsMbstringEnabled()) {
return mb_convert_encoding($value, $to, $from);
}
if($from == 'UTF-16LE'){
return self::utf16_decode($value, false);
}else if($from == 'UTF-16BE'){