diff --git a/phpgwapi/inc/class.translation.inc.php b/phpgwapi/inc/class.translation.inc.php index 2d35cb746b..d5665abd10 100644 --- a/phpgwapi/inc/class.translation.inc.php +++ b/phpgwapi/inc/class.translation.inc.php @@ -169,7 +169,8 @@ class translation { if(!empty(self::$system_charset)) { - ini_set('mbstring.internal_encoding',self::$system_charset); + $ini_default_charset = version_compare(PHP_VERSION, '5.6', '<') ? 'mbstring.internal_encoding' : 'default_charset'; + ini_set($ini_default_charset, self::$system_charset); } }