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

Bugfix: Work item GH-66 - Wrong check for maximum number of rows in Excel5 Writer

Browse Source
This commit is contained in:
Mark Baker
2012-10-25 12:57:48 +01:00
parent 701ff5adf1
commit 45f2829a33
4 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Classes/PHPExcel/Shared/String.php
+3 -4
View File
@@ -493,14 +493,13 @@ class PHPExcel_Shared_String
public static function ConvertEncoding($value, $to, $from)
{
if (self::getIsIconvEnabled()) {
$value = iconv($from, $to, $value);
return $value;
return iconv($from, $to, $value);
}
if (self::getIsMbstringEnabled()) {
$value = mb_convert_encoding($value, $to, $from);
return $value;
return mb_convert_encoding($value, $to, $from);
}
if($from == 'UTF-16LE'){
return self::utf16_decode($value, false);
}else if($from == 'UTF-16BE'){