summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2008-06-05 17:31:57 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2008-06-05 17:31:57 +0000
commit920713e287f23e582d4739db86dc177c1c26a2d1 (patch)
treed2b1817504b133141cb14ebaa542f7e66eb931d9
parent840f8f09cb3bc6e766bd95ae5af32650e2e0dc35 (diff)
#1485106
git-svn-id: https://svn.roundcube.net/trunk@1479 208e9e7b-5314-0410-a742-e7e81cd9613c
-rw-r--r--roundcubemail/CHANGELOG4
-rw-r--r--roundcubemail/program/include/rcube_imap.php3
2 files changed, 5 insertions, 2 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG
index b5acc622e..7a0ac9060 100644
--- a/roundcubemail/CHANGELOG
+++ b/roundcubemail/CHANGELOG
@@ -1,6 +1,10 @@
CHANGELOG RoundCube Webmail
---------------------------
+2008/06/05 (alec)
+----------
+- Fix removing messages from search set after deleting them (#1485106)
+
2008/06/03 (alec)
----------
- imap.inc: Fixed iil_MultLine(): use iil_ReadBytes() instead of iil_ReadLine()
diff --git a/roundcubemail/program/include/rcube_imap.php b/roundcubemail/program/include/rcube_imap.php
index 5e56eedb3..43c311735 100644
--- a/roundcubemail/program/include/rcube_imap.php
+++ b/roundcubemail/program/include/rcube_imap.php
@@ -1466,7 +1466,6 @@ class rcube_imap
if (!is_array($a_uids))
return false;
-
// convert uids to message ids
$a_mids = array();
foreach ($a_uids as $uid)
@@ -1483,7 +1482,7 @@ class rcube_imap
}
// remove message ids from search set
- if ($moved && $this->search_set && $mailbox == $this->mailbox)
+ if ($deleted && $this->search_set && $mailbox == $this->mailbox)
$this->search_set = array_diff($this->search_set, $a_mids);
// remove deleted messages from cache