- set mbstring's internal encoding in proper place

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

2 files changed, 8 insertions, 5 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
  * 
diff --git a/roundcubemail/program/include/main.inc b/roundcubemail/program/include/main.inc
index 0214d32f1..9223e26f8 100644
--- a/roundcubemail/program/include/main.inc
+++ b/roundcubemail/program/include/main.inc
@@ -207,12 +207,10 @@ function rcube_charset_convert($str, $from, $to=NULL)
       }
     }
 
-  // settings for mbstring module (by Tadashi Jokagi)
-  if (is_null($mbstring_loaded)) {
-    if ($mbstring_loaded = extension_loaded("mbstring"))
-      mb_internal_encoding(RCMAIL_CHARSET);
-  }
 
+  if (is_null($mbstring_loaded))
+    $mbstring_loaded = extension_loaded('mbstring');
+    
   // convert charset using mbstring module
   if ($mbstring_loaded)
     {