From 86df1529feb4b7eb1a9721baa194518bacbfd8ff Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 29 Dec 2006 21:06:39 +0000
Subject: Error handling for attachment uploads; multibyte-safe string
 functions; XSS improvements

---
 program/include/main.inc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'program/include/main.inc')

diff --git a/program/include/main.inc b/program/include/main.inc
index a1c00d340..f04636a4d 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -400,7 +400,7 @@ function load_gui()
 // set localization charset based on the given language
 function rcmail_set_locale($lang)
   {
-  global $OUTPUT, $MBSTRING;
+  global $OUTPUT, $CHARSET, $MBSTRING;
   static $s_mbstring_loaded = NULL;
   
   // settings for mbstring module (by Tadashi Jokagi)
@@ -408,6 +408,9 @@ function rcmail_set_locale($lang)
     $MBSTRING = $s_mbstring_loaded = extension_loaded("mbstring");
   else
     $MBSTRING = $s_mbstring_loaded = FALSE;
+    
+  if ($MBSTRING)
+    mb_internal_encoding($CHARSET);
 
   $OUTPUT->set_charset(rcube_language_prop($lang, 'charset'));
   }
-- 
cgit v1.2.3