Merge branch 'CorePack' into pilot

XoopsX · Sep 13, 2015 · b38f9b1 · b38f9b1
2 parents 69ac0e6 + 01495f5
commit b38f9b1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/html/include/corepack_version.php b/html/include/corepack_version.php
@@ -1,6 +1,6 @@
 <?php
 // XOOPS X (ten) CorePack version
-define('XOOPSX_COREPACK_VERSION', '20150801');
+define('XOOPSX_COREPACK_VERSION', '20150801.0913');
 // detaild_version for X-update
 define('_MI_LEGACY_DETAILED_VERSION', 'CorePack ' . XOOPSX_COREPACK_VERSION);
 define('XOOPS_DISTRIBUTION_VERSION', 'XOOPS X(ten) ' . XOOPSX_COREPACK_VERSION);

diff --git a/html/modules/legacy/kernel/Legacy_LanguageManager.class.php b/html/modules/legacy/kernel/Legacy_LanguageManager.class.php
@@ -54,9 +54,18 @@ function _setupMbstring()
 				@mb_regex_encoding(_CHARSET);
 			}
 
-			ini_set( 'mbstring.http_input', 'pass');
-			ini_set( 'mbstring.http_output', 'pass');
 			ini_set( 'mbstring.substitute_character', 'none');
+			ini_set( 'default_charset', _CHARSET);
+			ini_set( 'mbstring.substitute_character', 'none');
+			if (version_compare(PHP_VERSION, '5.6', '<')) {
+				ini_set( 'mbstring.http_input', 'pass');
+				ini_set( 'mbstring.http_output', 'pass');
+			} else {
+				@ini_set( 'mbstring.internal_encoding', '');
+				@ini_set( 'mbstring.http_input', '');
+				@ini_set( 'mbstring.http_output', '');
+			}
+
 		}
 		#endif