diff options
| author | svncommit <devs@roundcube.net> | 2008-10-05 03:05:16 +0000 |
|---|---|---|
| committer | svncommit <devs@roundcube.net> | 2008-10-05 03:05:16 +0000 |
| commit | a862043fe7d6095de0af7425ae5b2485bb896eb2 (patch) | |
| tree | 572451c8eb510219c79faaef1294000558164ea6 /program/steps/mail/func.inc | |
| parent | 9fa8bbb5b0a5d5dd26d5671190e61e51e9457ac1 (diff) | |
restore some script environment variables removed in r1918 but needed in "show" action
Diffstat (limited to 'program/steps/mail/func.inc')
| -rw-r--r-- | program/steps/mail/func.inc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index f2c4ea419..b7ef82ceb 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -73,6 +73,15 @@ if (empty($RCMAIL->action) || $RCMAIL->action == 'list') $OUTPUT->set_pagetitle(rcmail_localize_foldername($IMAP->get_mailbox_name())); } +else if ($RCMAIL->action == 'show') + { + // set current mailbox in client environment + $OUTPUT->set_env('mailbox', $IMAP->get_mailbox_name()); + if ($CONFIG['trash_mbox']) + $OUTPUT->set_env('trash_mailbox', $CONFIG['trash_mbox']); + if (!$OUTPUT->ajax_call) + rcube_add_label('checkingmail', 'deletemessage', 'movemessagetotrash', 'movingmessage'); + } /** @@ -183,7 +192,7 @@ function rcmail_message_list($attrib) $out .= '<td class="'.$col.$sort_class.'" id="rcmHead'.$col.'">' . "$col_name$sort</td>\n"; } - $out .= '<td class="icon">'.($attrib['attachmenticon'] ? sprintf($image_tag, $skin_path, $attrib['attachmenticon'], '') : '')."</td>\n"; + $out .= '<td class="icon">'.($attrib['attachmenticon'] ? sprintf($image_tag, $skin_path, $attrib['attachmenticon'], '') : ' ')."</td>\n"; $out .= "</tr></thead>\n<tbody>\n"; // no messages in this mailbox |