diff options
| author | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2006-12-04 22:34:40 +0000 |
|---|---|---|
| committer | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2006-12-04 22:34:40 +0000 |
| commit | 7f6c07c0e60e6ad0fcc334f884f6f499ea1a5b0d (patch) | |
| tree | 1df129a23403bc0baa3b16e51d0de355f3c31b2e /roundcubemail/program/steps | |
| parent | 9bc7d71bf1c6a4e0c8a3cd2a5aba80356514b305 (diff) | |
Small bugfixes and improvements
git-svn-id: https://svn.roundcube.net/trunk@395 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/steps')
| -rw-r--r-- | roundcubemail/program/steps/mail/func.inc | 4 | ||||
| -rw-r--r-- | roundcubemail/program/steps/mail/sendmail.inc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc index d655a3316..9bda8906d 100644 --- a/roundcubemail/program/steps/mail/func.inc +++ b/roundcubemail/program/steps/mail/func.inc @@ -513,8 +513,8 @@ function rcmail_js_message_list($a_headers, $insert_top=FALSE) $a_show_cols = is_array($CONFIG['list_cols']) ? $CONFIG['list_cols'] : array('subject'); // show 'to' instead of from in sent messages - if (strtolower($IMAP->get_mailbox_name())=='sent' && ($f = array_search('from', $a_show_cols)) - && !array_search('to', $a_show_cols)) + if (($IMAP->get_mailbox_name()==$CONFIG['sent_mbox'] || $IMAP->get_mailbox_name()==$CONFIG['drafts_mbox']) + && ($f = array_search('from', $a_show_cols)) && !array_search('to', $a_show_cols)) $a_show_cols[$f] = 'to'; $commands .= sprintf("this.set_message_coltypes(%s);\n", array2js($a_show_cols)); diff --git a/roundcubemail/program/steps/mail/sendmail.inc b/roundcubemail/program/steps/mail/sendmail.inc index c3e0170fe..41735881c 100644 --- a/roundcubemail/program/steps/mail/sendmail.inc +++ b/roundcubemail/program/steps/mail/sendmail.inc @@ -166,7 +166,7 @@ if (empty($identity_arr['string'])) $identity_arr['string'] = $from; // compose headers array -$headers = array('Date' => date('D, j M Y G:i:s O'), +$headers = array('Date' => date('D, j M Y H:i:s O'), 'From' => $identity_arr['string'], 'To' => rcube_charset_convert($mailto, $input_charset, $message_charset)); |