From adca76f7b7a91377d7e8f8dfc0c99844d14b5a9b Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Tue, 9 Dec 2008 22:07:51 -0700
Subject: [PATCH] Merge changes from IMP 4.3.1 (in CVS HEAD).

---
 imp/docs/CHANGES      | 2 ++
 imp/lib/IMAP/Tree.php | 2 +-
 imp/lib/Search.php    | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/imp/docs/CHANGES b/imp/docs/CHANGES
index 711b06869..8c18bab74 100644
--- a/imp/docs/CHANGES
+++ b/imp/docs/CHANGES
@@ -33,6 +33,8 @@ v5.0-cvs
 v4.3.1-cvs
 ----------
 
+[mms] Don't include Virtual Folder information in when tracking folder
+      tree changes (Bug #7739).
 [mms] Marked stripped parts as 'attachment', not 'inline' (Request #4664).
 [mms] Fix linking from addresses in mailbox to compose screen (Bug #7432).
 [jan] Use mailer configuration when sending iTip replies (Bug #7388).
diff --git a/imp/lib/IMAP/Tree.php b/imp/lib/IMAP/Tree.php
index 422f26193..fb0a66110 100644
--- a/imp/lib/IMAP/Tree.php
+++ b/imp/lib/IMAP/Tree.php
@@ -1486,7 +1486,7 @@ class IMP_IMAP_Tree
         foreach (array_keys($id) as $key) {
             $id_key = $this->VFOLDER_KEY . $this->_delimiter . $key;
             if (!isset($this->_tree[$id_key])) {
-                $adds[] = $this->VFOLDER_KEY . $this->_delimiter . $key;
+                $adds[] = $id_key;
             }
         }
 
diff --git a/imp/lib/Search.php b/imp/lib/Search.php
index e6a5aab4b..909c21716 100644
--- a/imp/lib/Search.php
+++ b/imp/lib/Search.php
@@ -208,7 +208,7 @@ class IMP_Search
      *
      * @param string $id          The search query id to use (by default, will
      *                            use the current ID set in the object).
-     * @param boolean $no_delete  Don't delete the entry in
+     * @param boolean $no_delete  Don't delete the entry in the tree object.
      *
      * @return string  Returns the search query id.
      */
-- 
2.11.0