- set mbstring's internal encoding in proper place

git-svn-id: https://svn.roundcube.net/trunk@1968 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 5 insertions, 0 deletions

diff --git a/roundcubemail/program/include/iniset.php b/roundcubemail/program/include/iniset.php
index 5fe10114d..f81c04a90 100755
--- a/roundcubemail/program/include/iniset.php
+++ b/roundcubemail/program/include/iniset.php
@@ -62,6 +62,11 @@ if (!ini_get('safe_mode')) {
   set_time_limit(120);
 }
 
+// set internal encoding for mbstring extension
+if(extension_loaded('mbstring'))
+  mb_internal_encoding(RCMAIL_CHARSET);
+	      
+
 /**
  * Use PHP5 autoload for dynamic class loading
  *