From 5faac054c30d38459e157ebc90e8e7b4b3c292b2 Mon Sep 17 00:00:00 2001 From: alecpl Date: Tue, 10 Feb 2009 11:49:29 +0000 Subject: - Use default_charset for messages without specified charset (#1485661, #1484961) --- program/steps/mail/func.inc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'program') 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("%s\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) -- cgit v1.2.3