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

diff --git a/ChangeLog b/ChangeLog
index 9fd8464e7f61e012880acf907d17dca8b69b19bc..e2bf859efd685e3c7e28f2fd0b508340e993fc30 100644 (file)
--- 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 6f798dbbfef3dec88e7e49c5c610b1b94aafc39b..1deb9bc74030687dd875f2b6e6840fb0b68fdbac 100755 (executable)
--- 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;
 }