nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'QA_3_3'

Browse Source
This commit is contained in:
Dieter Adriaenssens
2010-04-12 20:17:23 +02:00
parent 6d05e375e8 f73b0e0195
commit ed9ef7cb12
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -74,6 +74,8 @@ $Id$
only Structure is done, thanks to Ankit Gupta - ankitgupta3 only Structure is done, thanks to Ankit Gupta - ankitgupta3
- patch #2984893 [engines] InnoDB storage page emits a warning, - patch #2984893 [engines] InnoDB storage page emits a warning,
thanks to Madhura Jayaratne - madhuracj 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) 3.3.2.0 (not yet released)
- patch #2969449 [core] Name for MERGE engine varies depending on the - patch #2969449 [core] Name for MERGE engine varies depending on the

6
libraries/PHPExcel/PHPExcel/Shared/String.php
View File

@@ -97,7 +97,11 @@ class PHPExcel_Shared_String
return self::$_isIconvEnabled; 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; true : false;
return self::$_isIconvEnabled; return self::$_isIconvEnabled;