Merge branch 'master' into CorePack

XoopsX · Sep 13, 2015 · 6234ae5 · 6234ae5
2 parents 86a650d + ef0d5a7
commit 6234ae5
Showing 1 changed file with 11 additions and 2 deletions.
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