From 0c9cc9bdbdceb6357fd1f59752efa289c61f2210 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 9 Dec 2014 16:46:37 +0000
Subject: [PATCH] using php version depending default_charset or
 mbstring.internal_encoding

---
 phpgwapi/inc/class.translation.inc.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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);
 			}
 		}