summaryrefslogtreecommitdiff
path: root/program/steps/mail
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2009-02-10 11:49:29 +0000
committeralecpl <alec@alec.pl>2009-02-10 11:49:29 +0000
commit5faac054c30d38459e157ebc90e8e7b4b3c292b2 (patch)
treedb1b0f9c447d2e8140bbdc40bfcd784d627e7f0d /program/steps/mail
parent9f35269358f9fa4e174de61e187ebc128ba38708 (diff)
- Use default_charset for messages without specified charset (#1485661, #1484961)
Diffstat (limited to 'program/steps/mail')
-rw-r--r--program/steps/mail/func.inc6
1 files changed, 2 insertions, 4 deletions
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)