浏览代码

remove call to expunge in sqimap_mailbox_select

Erin Schnabel 21 年之前
父节点
当前提交
f59c3343ef
共有 2 个文件被更改,包括 2 次插入5 次删除
  1. 2 0
      ChangeLog
  2. 0 5
      functions/imap_mailbox.php

+ 2 - 0
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
 --------------------

+ 0 - 5
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;
 }