[Svn] r2933 - in trunk/roundcubemail: . program/steps/mail

trac at roundcube.net trac at roundcube.net
Tue Sep 8 10:04:17 CEST 2009


Author: alec
Date: 2009-09-08 03:04:17 -0500 (Tue, 08 Sep 2009)
New Revision: 2933

Modified:
   trunk/roundcubemail/CHANGELOG
   trunk/roundcubemail/program/steps/mail/show.inc
Log:
- Fix delete in message view deletes permanently with flag_for_deletion=true (#1486101)


Modified: trunk/roundcubemail/CHANGELOG
===================================================================
--- trunk/roundcubemail/CHANGELOG	2009-09-07 12:51:21 UTC (rev 2932)
+++ trunk/roundcubemail/CHANGELOG	2009-09-08 08:04:17 UTC (rev 2933)
@@ -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)

Modified: trunk/roundcubemail/program/steps/mail/show.inc
===================================================================
--- trunk/roundcubemail/program/steps/mail/show.inc	2009-09-07 12:51:21 UTC (rev 2932)
+++ trunk/roundcubemail/program/steps/mail/show.inc	2009-09-08 08:04:17 UTC (rev 2933)
@@ -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');
         
@@ -143,9 +153,6 @@
       $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));

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn



More information about the Svn mailing list