No need for getSearchMailboxes()

diff --git a/imp/lib/Filter.php b/imp/lib/Filter.php
index caf580e..e3edecf 100644 (file)
--- a/imp/lib/Filter.php
+++ b/imp/lib/Filter.php
@@ -39,7 +39,7 @@ class IMP_Filter
 
         $imp_search = $GLOBALS['injector']->getInstance('IMP_Search');
         $mbox_list = $imp_search->isSearchMbox($mbox)
-            ? $imp_search->getSearchMailboxes($mbox)
+            ? $imp_search[$mbox]->mboxes
             : array($mbox);
 
         foreach ($mbox_list as $val) {

diff --git a/imp/lib/Message.php b/imp/lib/Message.php
index b2f3803..7b4321e 100644 (file)
--- a/imp/lib/Message.php
+++ b/imp/lib/Message.php
@@ -726,7 +726,7 @@ class IMP_Message
         foreach (array_keys($mbox_list) as $key) {
             if (!$imp_imap->isReadOnly($key)) {
                 if ($imp_search->isSearchMbox($key)) {
-                    foreach ($imp_search->getSearchMailboxes($key) as $skey) {
+                    foreach ($imp_search[$key]->mboxes as $skey) {
                         $process_list[$skey] = $mbox_list[$key];
                     }
                 } else {
@@ -785,7 +785,7 @@ class IMP_Message
             }
 
             if ($imp_search->isVTrash($mbox)) {
-                $this->expungeMailbox(array_flip($imp_search->getSearchMailboxes($mbox)));
+                $this->expungeMailbox(array_flip($imp_search[$mbox]->mboxes));
                 $notification->push(_("Emptied all messages from Virtual Trash Folder."), 'horde.success');
                 continue;
             }

diff --git a/imp/lib/Search.php b/imp/lib/Search.php
index db45297..c3d6cdd 100644 (file)
--- a/imp/lib/Search.php
+++ b/imp/lib/Search.php
@@ -361,20 +361,6 @@ class IMP_Search implements ArrayAccess, Iterator, Serializable
     }
 
     /**
-     * Get the list of searchable folders for the given search query.
-     *
-     * @param string $id  The search query id.
-     *
-     * @return array  The list of searchable folders.
-     */
-    public function getSearchMailboxes($id)
-    {
-        return isset($this[$id])
-            ? $this[$id]->mboxes
-            : array();
-    }
-
-    /**
      * Returns a link to edit a given search query.
      *
      * @param string $id  The search query id.

diff --git a/imp/mailbox-mimp.php b/imp/mailbox-mimp.php
index 0aecf7a..0a982d1 100644 (file)
--- a/imp/mailbox-mimp.php
+++ b/imp/mailbox-mimp.php
@@ -247,7 +247,7 @@ if (!$search_mbox && IMP::threadSortAvailable(IMP::$mailbox)) {
 /* Add search link. */
 if ($_SESSION['imp']['protocol'] == 'imap') {
     if ($search_mbox) {
-        $orig_mbox = reset($imp_search->getSearchMailboxes(IMP::$mailbox));
+        $orig_mbox = reset($imp_search[IMP::$mailbox]->mboxes);
         $menu[] = array(sprintf(_("New Search in %s"), IMP::getLabel($orig_mbox)), IMP::generateIMPUrl('mailbox-mimp.php', $orig_mbox)->add('a', 's'));
     } else {
         $menu[] = array(_("Search"), $mailbox_url->copy()->add('a', 's'));

diff --git a/imp/mailbox.php b/imp/mailbox.php
index c689c71..14ea04b 100644 (file)
--- a/imp/mailbox.php
+++ b/imp/mailbox.php
@@ -402,7 +402,7 @@ if ($_SESSION['imp']['protocol'] != 'pop') {
                 $edit_search = _("Edit Search Query");
             } else {
                 /* Basic search results. */
-                $search_mailbox = reset($imp_search->getSearchMailboxes(IMP::$mailbox));
+                $search_mailbox = reset($imp_search[IMP::$mailbox]->mboxes);
                 $hdr_template->set('search_url', Horde::url('search-basic.php')->add('search_mailbox', $search_mailbox));
                 $hdr_template->set('searchclose', IMP::generateIMPUrl('mailbox.php', $search_mailbox));
             }