The branch, master has been updated via ed9ef7cb12ab421e74355ebb278f51b41e5987f2 (commit) via f73b0e0195be22ee89c244e26301051f4d7a1933 (commit) from 6d05e375e8645cb53293ba53fe8d48c96e38f3e7 (commit) - Log ----------------------------------------------------------------- commit ed9ef7cb12ab421e74355ebb278f51b41e5987f2 Merge: 6d05e375e8645cb53293ba53fe8d48c96e38f3e7 f73b0e0195be22ee89c244e26301051f4d7a1933 Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Mon Apr 12 20:17:23 2010 +0200 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ libraries/PHPExcel/PHPExcel/Shared/String.php | 6 +++++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index b2f9da9..9e868eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -74,6 +74,8 @@ $Id$ only Structure is done, thanks to Ankit Gupta - ankitgupta3 - patch #2984893 [engines] InnoDB storage page emits a warning, thanks to Madhura Jayaratne - madhuracj +- bug #2974687, bug #2974692 [compatibility] PHPExcel : IBM AIX iconv() does not work, + thanks to Björn Wiberg - bwiberg 3.3.2.0 (not yet released) - patch #2969449 [core] Name for MERGE engine varies depending on the diff --git a/libraries/PHPExcel/PHPExcel/Shared/String.php b/libraries/PHPExcel/PHPExcel/Shared/String.php index b6a17a3..8a105f0 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/String.php +++ b/libraries/PHPExcel/PHPExcel/Shared/String.php @@ -97,7 +97,11 @@ class PHPExcel_Shared_String return self::$_isIconvEnabled; } - self::$_isIconvEnabled = function_exists('iconv') ? + // IBM AIX iconv() does not work + self::$_isIconvEnabled = function_exists('iconv') && + !(defined('PHP_OS') && @stristr(PHP_OS, 'AIX') && defined('ICONV_IMPL') + && (@strcasecmp(ICONV_IMPL, 'unknown') == 0) && defined('ICONV_VERSION') + && (@strcasecmp(ICONV_VERSION, 'unknown') == 0)) ? true : false; return self::$_isIconvEnabled; hooks/post-receive -- phpMyAdmin