diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-02-10 11:49:29 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-02-10 11:49:29 +0000 |
| commit | 2d2bfc3abbd41ddafbeb8c741270dfb32547b2e5 (patch) | |
| tree | 8419ba89b845f750fe533f7b4820b883193f80c6 /roundcubemail | |
| parent | c4bafd61dcc839b213c12b319da65ad3d02b1ad3 (diff) | |
- Use default_charset for messages without specified charset (#1485661, #1484961)
git-svn-id: https://svn.roundcube.net/trunk@2286 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail')
| -rw-r--r-- | roundcubemail/CHANGELOG | 4 | ||||
| -rw-r--r-- | roundcubemail/program/steps/mail/func.inc | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index c608c4013..7e57645f6 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -1,6 +1,10 @@ CHANGELOG RoundCube Webmail --------------------------- +2009/02/10 (alec) +---------- +- Use default_charset for messages without specified charset (#1485661, #1484961) + 2009/02/08 (thomasb) ---------- - Added TNEF support to decode MS Outlook attachments (winmail.dat) diff --git a/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc index 0ccc2cc13..f54d4facd 100644 --- a/roundcubemail/program/steps/mail/func.inc +++ b/roundcubemail/program/steps/mail/func.inc @@ -295,8 +295,7 @@ function rcmail_message_list($attrib) $out .= sprintf("<td class=\"icon\">%s</td>\n", $message_icon ? sprintf($image_tag, $skin_path, $message_icon, '') : ''); - if (!empty($header->charset)) - $IMAP->set_charset($header->charset); + $IMAP->set_charset(!empty($header->charset) ? $header->charset : $CONFIG['default_charset']); // format each col foreach ($a_show_cols as $col) @@ -404,8 +403,7 @@ function rcmail_js_message_list($a_headers, $insert_top=FALSE) if (empty($header)) continue; - if (!empty($header->charset)) - $IMAP->set_charset($header->charset); + $IMAP->set_charset(!empty($header->charset) ? $header->charset : $CONFIG['default_charset']); // remove 'attachment' and 'flag' columns, we don't need them here if(($key = array_search('attachment', $a_show_cols)) !== FALSE) |