diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-10-09 12:54:21 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-10-09 12:54:21 +0000 |
| commit | 93af327ec10d28026ae39326658fdc2a91b76010 (patch) | |
| tree | 3b211bcbdf17976e2193b3758ce7010b8e683fa0 /roundcubemail/program/include/main.inc | |
| parent | 5496e6fd8aad3a22dde79a5c5c9e3efbd392ba5a (diff) | |
- set mbstring's internal encoding in proper place
git-svn-id: https://svn.roundcube.net/trunk@1968 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/include/main.inc')
| -rw-r--r-- | roundcubemail/program/include/main.inc | 8 |
1 files changed, 3 insertions, 5 deletions
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) { |