diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-09-08 08:04:17 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-09-08 08:04:17 +0000 |
| commit | c6f972a0b536be826375d1fd0642ad6cadb518f0 (patch) | |
| tree | 697cb06d6c3b9c327387e656ccf6dc3e3c0b83cb | |
| parent | b2252a974ff10647abed98f268af1ba81b11605c (diff) | |
- Fix delete in message view deletes permanently with flag_for_deletion=true (#1486101)
git-svn-id: https://svn.roundcube.net/trunk@2933 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/program/steps/mail/show.inc | 13 |
2 files changed, 11 insertions, 3 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index 9dd9197d8..a61ebe7b6 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG RoundCube Webmail =========================== +- Fix delete in message view deletes permanently with flag_for_deletion=true (#1486101) - Use faster/secure mt_rand() (#1486094) - Fix roundcube hangs on empty inbox with bincimapd (#1486093) - Fix wrong headers for IE on servers without $_SERVER['HTTPS'] (#1485926) diff --git a/roundcubemail/program/steps/mail/show.inc b/roundcubemail/program/steps/mail/show.inc index 88961e9aa..c7431d6ed 100644 --- a/roundcubemail/program/steps/mail/show.inc +++ b/roundcubemail/program/steps/mail/show.inc @@ -74,8 +74,18 @@ if ($_GET['_uid']) { $OUTPUT->set_env('sender', $MESSAGE->sender['string']); $OUTPUT->set_env('permaurl', rcmail_url('show', array('_uid' => $MESSAGE->uid, '_mbox' => $mbox_name))); $OUTPUT->set_env('mailbox', $mbox_name); + if ($CONFIG['trash_mbox']) $OUTPUT->set_env('trash_mailbox', $CONFIG['trash_mbox']); + if ($CONFIG['flag_for_deletion']) + $OUTPUT->set_env('flag_for_deletion', true); + if ($CONFIG['read_when_deleted']) + $OUTPUT->set_env('read_when_deleted', true); + if ($CONFIG['skip_deleted']) + $OUTPUT->set_env('skip_deleted', true); + if ($CONFIG['display_next']) + $OUTPUT->set_env('display_next', true); + if (!$OUTPUT->ajax_call) $OUTPUT->add_label('checkingmail', 'deletemessage', 'movemessagetotrash', 'movingmessage'); @@ -143,9 +153,6 @@ if ($_GET['_uid']) { $OUTPUT->set_env('last_uid', $last); } - if ($CONFIG['display_next']) - $OUTPUT->set_env('display_next', true); - if (!$MESSAGE->headers->seen) $RCMAIL->plugins->exec_hook('message_read', array('uid' => $MESSAGE->uid, 'mailbox' => $IMAP->mailbox, 'message' => $MESSAGE)); |