[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_2RC1-20-gf73b0e0

[Dieter Adriaenssens]

The branch, QA_3_3 has been updated
       via  f73b0e0195be22ee89c244e26301051f4d7a1933 (commit)
      from  d0d24a6e714646a3660c64549382c07375967feb (commit)


- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

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 ab8e8c0..3cd0606 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
   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