From f4f322ec568a54b6e8b3a2f3eb581484543898e6 Mon Sep 17 00:00:00 2001 From: thomasb Date: Fri, 29 Dec 2006 21:06:39 +0000 Subject: Error handling for attachment uploads; multibyte-safe string functions; XSS improvements git-svn-id: https://svn.roundcube.net/trunk@440 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/include/main.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'roundcubemail/program/include/main.inc') diff --git a/roundcubemail/program/include/main.inc b/roundcubemail/program/include/main.inc index a1c00d340..f04636a4d 100644 --- a/roundcubemail/program/include/main.inc +++ b/roundcubemail/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