From 11ea2ac890100f4000b7db4b33672a8ad8ca01fb Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 08 Sep 2009 04:04:17 -0400
Subject: [PATCH] - Fix delete in message view deletes permanently with flag_for_deletion=true (#1486101)
---
program/steps/mail/show.inc | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
index 88961e9..c7431d6 100644
--- a/program/steps/mail/show.inc
+++ b/program/steps/mail/show.inc
@@ -74,8 +74,18 @@
$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');
@@ -142,9 +152,6 @@
if ($last > 0)
$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,
--
Gitblit v1.9.1