Merge branch 'QA_3_3'

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

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;