Skip to content
This repository was archived by the owner on Jan 2, 2019. It is now read-only.

Commit d79bdc5

Browse files
author
Mark Baker
committed
iconv rather than mbstring for convert encoding
1 parent 4779025 commit d79bdc5

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Classes/PHPExcel/Shared/String.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -491,14 +491,14 @@ public static function UTF8toBIFF8UnicodeLong($value)
491491
*/
492492
public static function ConvertEncoding($value, $to, $from)
493493
{
494-
if (self::getIsMbstringEnabled()) {
495-
return mb_convert_encoding($value, $to, $from);
496-
}
497-
498494
if (self::getIsIconvEnabled()) {
499495
return iconv($from, $to, $value);
500496
}
501497

498+
if (self::getIsMbstringEnabled()) {
499+
return mb_convert_encoding($value, $to, $from);
500+
}
501+
502502
if($from == 'UTF-16LE'){
503503
return self::utf16_decode($value, false);
504504
}else if($from == 'UTF-16BE'){

0 commit comments

Comments
 (0)