From b86c49398094717a28e7738283fea7c164c4c871 Mon Sep 17 00:00:00 2001 From: pdontthink Date: Fri, 11 Mar 2011 02:22:57 +0000 Subject: [PATCH] Undelete button shouldn't be related to whether or not a trash folder is in use - it's just a product of auto-expunge git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@14092 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/mailbox_display.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index c36ddcd4..fa3a4eb9 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -1041,7 +1041,7 @@ function showMessagesForMailbox($imapConnection, &$aMailbox,$aProps, &$iError) { $trash_folder) ? true : false; // $showUndelete = (!$aMailbox['AUTO_EXPUNGE'] && $aMailbox['RIGHTS'] != 'READ-ONLY' && - in_array('\\deleted',$aMailbox['PERMANENTFLAGS'], true) && !$trash_folder) ? true : false; + in_array('\\deleted',$aMailbox['PERMANENTFLAGS'], true) /* trash folder unrelated methinks: && !$trash_folder*/) ? true : false; $showMove = ($aMailbox['RIGHTS'] != 'READ-ONLY') ? true : false; $showExpunge = (!$aMailbox['AUTO_EXPUNGE'] && $aMailbox['RIGHTS'] != 'READ-ONLY' && in_array('\\deleted',$aMailbox['PERMANENTFLAGS'], true)) ? true : false; -- 2.25.1