diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-10-02 18:57:45 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-10-02 18:57:45 +0000 |
| commit | c019b35abd0731afbb3519aee9f4965a39ed00fd (patch) | |
| tree | f0e9d8599dd4b21b772cda21ca917943c0b037cc | |
| parent | 1e7144a038a9c99f4267ba5cc087129dbbf6e24b (diff) | |
- Use default_charset for bodies of messages without charset definition (#1486187)
git-svn-id: https://svn.roundcube.net/trunk@3010 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/program/include/rcube_imap.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index ee2af5f33..6a8449708 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG RoundCube Webmail =========================== +- Use default_charset for bodies of messages without charset definition (#1486187) - Password: added cPanel driver - Fix return to first page from e-mail screen (#1486105) - Fix handling HTML comments in HTML messages (#1486189) diff --git a/roundcubemail/program/include/rcube_imap.php b/roundcubemail/program/include/rcube_imap.php index 6e98b208a..d1021fd98 100644 --- a/roundcubemail/program/include/rcube_imap.php +++ b/roundcubemail/program/include/rcube_imap.php @@ -1554,7 +1554,7 @@ class rcube_imap // convert charset (if text or message part) if ($o_part->ctype_primary=='text' || $o_part->ctype_primary=='message') { // assume default if no charset specified - if (empty($o_part->charset)) + if (empty($o_part->charset) || strtolower($o_part->charset) == 'us-ascii') $o_part->charset = $this->default_charset; $body = rcube_charset_convert($body, $o_part->charset); |