diff options
| author | alecpl <alec@alec.pl> | 2009-02-10 11:49:29 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2009-02-10 11:49:29 +0000 |
| commit | 5faac054c30d38459e157ebc90e8e7b4b3c292b2 (patch) | |
| tree | db1b0f9c447d2e8140bbdc40bfcd784d627e7f0d | |
| parent | 9f35269358f9fa4e174de61e187ebc128ba38708 (diff) | |
- Use default_charset for messages without specified charset (#1485661, #1484961)
| -rw-r--r-- | CHANGELOG | 4 | ||||
| -rw-r--r-- | program/steps/mail/func.inc | 6 |
2 files changed, 6 insertions, 4 deletions
@@ -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/program/steps/mail/func.inc b/program/steps/mail/func.inc index 0ccc2cc13..f54d4facd 100644 --- a/program/steps/mail/func.inc +++ b/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) |