From 1a3b90c0e1e0817cf57bac5c4bddc2a2f4371cc7 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Tue, 28 Jul 2009 00:10:53 -0600
Subject: [PATCH] On error, we can directly load mailbox.php page here.

---
 imp/search.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/imp/search.php b/imp/search.php
index 0ae84216b..fb0b8a895 100644
--- a/imp/search.php
+++ b/imp/search.php
@@ -1,5 +1,7 @@
 <?php
 /**
+ * IMP search script.
+ *
  * URL Parameters:
  * ---------------
  * 'search_mailbox'  --  If exists, don't show the folder selection list; use
@@ -18,10 +20,12 @@
 
 require_once dirname(__FILE__) . '/lib/base.php';
 
-/* Redirect back to the mailbox if searching is not allowed. */
+/* Load mailbox page if searching is not allowed. */
 if ($_SESSION['imp']['protocol'] == 'pop') {
     $notification->push(_("Searching is not available with a POP3 server."), 'horde.error');
-    header('Location: ' . Horde::applicationUrl('mailbox.php', true));
+    $from_message_page = true;
+    $actionID = $start = null;
+    require_once IMP_BASE . '/mailbox.php';
     exit;
 }
 
-- 
2.11.0