[mms] Fix advanced search in all mailboxes if virtual folders or remo…

…te accounts exist (Bug #13384). Conflicts: imp/docs/CHANGES imp/package.xml
horde · Jul 23, 2014 · fb87d9d · fb87d9d
1 parent 9f4dce9
commit fb87d9d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/imp/docs/CHANGES b/imp/docs/CHANGES
@@ -11,6 +11,8 @@ v6.3.0-git
 v6.2.1
 ------
 
+[mms] Fix advanced search in all mailboxes if virtual folders or remote
+      accounts exist (Bug #13384).
 [mms] Fix regression in automatically expanding deeply nested mailboxes in the
       dynamic folder list.
 [mms] Fix regression where containers could not be moved via drag/drop in

diff --git a/imp/lib/Search/Query.php b/imp/lib/Search/Query.php
@@ -218,7 +218,10 @@ public function __get($name)
                     $iterator = new IMP_Ftree_IteratorFilter(
                         $injector->getInstance('IMP_Ftree')
                     );
-                    $iterator->add($iterator::CONTAINERS);
+                    $iterator->add(array(
+                        $iterator::CONTAINERS,
+                        $iterator::NONIMAP
+                    ));
 
                     foreach ($iterator as $val) {
                         $mbox[] = $val->mbox_ob;

diff --git a/imp/package.xml b/imp/package.xml
@@ -3700,6 +3700,7 @@
    <date>2014-07-08</date>
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
+* [mms] Fix advanced search in all mailboxes if virtual folders or remote accounts exist (Bug #13384).
 * [mms] Fix regression in automatically expanding deeply nested mailboxes in the dynamic folder list.
 * [mms] Fix regression where containers could not be moved via drag/drop in dynamic view.
 * [mms] Don&apos;t perform purge sentmail login task unless at least one sentmail mailbox exists.