diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-11-04 13:05:29 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-11-04 13:05:29 +0000 |
| commit | 9bc38e69308f3f6b57e7c9275a7da6a5490881ec (patch) | |
| tree | 7f0d85cc56f12d4c043a4fdff1dbc6bfccdbbcc3 /roundcubemail/program/include | |
| parent | 3bc0885adf4ce4ae5e70fe427f6ba001b350e749 (diff) | |
- Skip conversion when input charset is BINARY
git-svn-id: https://svn.roundcube.net/trunk@4178 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/include')
| -rw-r--r-- | roundcubemail/program/include/main.inc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/roundcubemail/program/include/main.inc b/roundcubemail/program/include/main.inc index 242fb1ac3..4bf721336 100644 --- a/roundcubemail/program/include/main.inc +++ b/roundcubemail/program/include/main.inc @@ -197,7 +197,7 @@ function rcube_charset_convert($str, $from, $to=NULL) static $mbstring_list = null; static $convert_warning = false; static $conv = null; - + $error = false; $to = empty($to) ? strtoupper(RCMAIL_CHARSET) : rcube_parse_charset($to); @@ -341,6 +341,9 @@ function rcube_parse_charset($input) '/^X-/', // X- prefix (e.g. X-ROMAN8 => ROMAN8) ), '', $charset); + if ($charset == 'BINARY') + return $charsets[$input] = null; + # Aliases: some of them from HTML5 spec. $aliases = array( 'USASCII' => 'WINDOWS-1252', |