diff options
| author | thomascube <thomas@roundcube.net> | 2006-12-29 21:06:39 +0000 |
|---|---|---|
| committer | thomascube <thomas@roundcube.net> | 2006-12-29 21:06:39 +0000 |
| commit | 86df1529feb4b7eb1a9721baa194518bacbfd8ff (patch) | |
| tree | 380827ed01c3e3e3a3253d0b00c350b467186a25 /program/include/main.inc | |
| parent | 3b12aeeeca89bbc3d8cc5342beb07643067e3760 (diff) | |
Error handling for attachment uploads; multibyte-safe string functions; XSS improvements
Diffstat (limited to 'program/include/main.inc')
| -rw-r--r-- | program/include/main.inc | 5 |
1 files changed, 4 insertions, 1 deletions
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')); } |