From a3a0aa73e791064b2d78cc0a34efeba023406357 Mon Sep 17 00:00:00 2001 From: Mark Baker Date: Thu, 16 Sep 2010 17:04:11 +0000 Subject: [PATCH] Bugfix: Workitems 14260 & 14233 - Setting cell values to one char strings & Trouble reading one character string git-svn-id: https://phpexcel.svn.codeplex.com/svn/trunk@61062 2327b42d-5241-43d6-9e2a-de5ac946f064 --- Classes/PHPExcel/Shared/String.php | 6 +++--- changelog.txt | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Classes/PHPExcel/Shared/String.php b/Classes/PHPExcel/Shared/String.php index 1448720f..90e1dd27 100644 --- a/Classes/PHPExcel/Shared/String.php +++ b/Classes/PHPExcel/Shared/String.php @@ -303,7 +303,7 @@ class PHPExcel_Shared_String // Sometimes iconv_substr('A', 0, 1, 'UTF-8') just returns false in PHP 5.2.0 // we cannot use iconv in that case either (http://bugs.php.net/bug.php?id=37773) - if (!@iconv('UTF-8', 'UTF-16LE', 'x')) { + if (!@iconv_substr('A', 0, 1, 'UTF-8')) { self::$_isIconvEnabled = false; return false; } @@ -491,7 +491,7 @@ class PHPExcel_Shared_String // else, no conversion return $value; } - + /** * Decode UTF-16 encoded strings. * @@ -602,7 +602,7 @@ class PHPExcel_Shared_String $localeconv = localeconv(); self::$_decimalSeparator = $localeconv['decimal_point'] != '' ? $localeconv['decimal_point'] : $localeconv['mon_decimal_point']; - + if (self::$_decimalSeparator == '') { // Default to . diff --git a/changelog.txt b/changelog.txt index c1674205..e6bcfa5b 100644 --- a/changelog.txt +++ b/changelog.txt @@ -40,6 +40,7 @@ Fixed in SVN: - Bugfix: (MBaker) Workitem 14223 - Advanced Value Binder Not Working? - Bugfix: (MBaker) Workitem 14226 - unassigned object variable in PHPExcel->removeCellXfByIndex - Bugfix: (MBaker) Workitem 14236 - problem with getting cell values from another worksheet... (if cell doesn't exist) +- Bugfix: (MBaker) Workitem 14260 & 14233 - Setting cell values to one char strings & Trouble reading one character string (thanks gorfou) 2010-08-26 (v1.7.4):