From 9f84f4a5ec3fd91ad7347bceba749cd774b95d3e Mon Sep 17 00:00:00 2001 From: ebullient Date: Thu, 29 Apr 2004 03:48:13 +0000 Subject: [PATCH] remove call to expunge in sqimap_mailbox_select git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@7303 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- ChangeLog | 2 ++ functions/imap_mailbox.php | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9fd8464e..e2bf859e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,8 @@ Version 1.5.1 -- CVS - Fixed RFC2298 incompliancy by setting envelop sender to null. - Fixed problem where setting all the messages on the last page of the message list would return one page higher. + - Remove call to perform expunge on mailbox select - auto-expunge will + still be performed on message delete, etc. Version 1.5.0 -------------------- diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php index 6f798dbb..1deb9bc7 100755 --- a/functions/imap_mailbox.php +++ b/functions/imap_mailbox.php @@ -320,8 +320,6 @@ function sqimap_mailbox_exists ($imap_stream, $mailbox) { * Selects a mailbox */ function sqimap_mailbox_select ($imap_stream, $mailbox) { - global $auto_expunge; - if ($mailbox == 'None') { return; } @@ -348,9 +346,6 @@ function sqimap_mailbox_select ($imap_stream, $mailbox) { $result['RIGHTS']=$regs[1]; } - if ($auto_expunge) { - $tmp = sqimap_run_command($imap_stream, 'EXPUNGE', false, $a, $b); - } return $result; } -- 2.25.1