Fix search mailbox determination for re-search

diff --git a/imp/mailbox.php b/imp/mailbox.php
index 2c56bda..46c9f33 100644 (file)
--- a/imp/mailbox.php
+++ b/imp/mailbox.php
@@ -439,8 +439,8 @@ if ($_SESSION['imp']['protocol'] != 'pop') {
             $hdr_template->set('delete_vfolder', Horde::link($imp_search->deleteURL(), sprintf(_("Delete Virtual Folder Definition for %s"), htmlspecialchars($rawtitle)), null, null, "if (confirm('" . addslashes(_("Are you sure you want to delete this Virtual Folder Definition?")) . "')) { return true; } else { return false; }") . Horde::img('delete.png', sprintf(_("Delete Virtual Folder Definition for %s"), $rawtitle), '', $graphicsdir) . '</a>');
         } elseif (!$query_text) {
             /* Mini search results. */
-            reset($mbox_info['uids']);
-            $hdr_template->set('search', Horde::link(Horde_Util::addParameter(Horde::applicationUrl('search-basic.php'), 'search_mailbox', key($mbox_info['uids'])), sprintf(_("Search %s"), IMP::getLabel(key($mbox_info['uids'])))) . Horde::img('search.png', _("Search")) . '</a>');
+            $search_mailbox = reset($imp_search->getSearchFolders());
+            $hdr_template->set('search', Horde::link(Horde_Util::addParameter(Horde::applicationUrl('search-basic.php'), array('search_mailbox' => $search_mailbox)), sprintf(_("Search %s"), IMP::getLabel($search_mailbox))) . Horde::img('search.png', _("Search")) . '</a>');
         } elseif (!$vfolder) {
             $edit_search = _("Edit Search Query");
         }