From e2efa454e11ff26155cab6c866b03ae164cd2d1d Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com" <>
Date: Wed, 26 Jul 2006 06:22:48 +0000
Subject: Bug 338869: The 'quicksearch' field in the footer redirects to
 http:// even when sslbase is in use - Patch by Frédéric Buclin
 <LpSolit@gmail.com> r=mkanat a=myk
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Bugzilla/Search/Quicksearch.pm | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'Bugzilla/Search')

diff --git a/Bugzilla/Search/Quicksearch.pm b/Bugzilla/Search/Quicksearch.pm
index 1c0f4250b..4cb34eda8 100644
--- a/Bugzilla/Search/Quicksearch.pm
+++ b/Bugzilla/Search/Quicksearch.pm
@@ -28,6 +28,7 @@ use Bugzilla::Constants;
 use Bugzilla::Keyword;
 use Bugzilla::Bug;
 use Bugzilla::Field;
+use Bugzilla::Util;
 
 use base qw(Exporter);
 @Bugzilla::Search::Quicksearch::EXPORT = qw(quicksearch);
@@ -106,6 +107,7 @@ our ($chart, $and, $or);
 sub quicksearch {
     my ($searchstring) = (@_);
     my $cgi = Bugzilla->cgi;
+    my $urlbase = correct_urlbase();
 
     $chart = 0;
     $and   = 0;
@@ -123,8 +125,7 @@ sub quicksearch {
 
         if (index($searchstring, ',') < $[) {
             # Single bug number; shortcut to show_bug.cgi.
-            print $cgi->redirect(-uri => Bugzilla->params->{'urlbase'} .
-                                         "show_bug.cgi?id=$searchstring");
+            print $cgi->redirect(-uri => "${urlbase}show_bug.cgi?id=$searchstring");
             exit;
         }
         else {
@@ -143,8 +144,7 @@ sub quicksearch {
                                                   WHERE alias = ?},
                                                undef,
                                                $1)) {
-                print $cgi->redirect(-uri => Bugzilla->params->{'urlbase'} .
-                                             "show_bug.cgi?id=$1");
+                print $cgi->redirect(-uri => "${urlbase}show_bug.cgi?id=$1");
                 exit;
             }
         }
@@ -387,8 +387,7 @@ sub quicksearch {
 
     if ($cgi->param('load')) {
         # Param 'load' asks us to display the query in the advanced search form.
-        print $cgi->redirect(-uri => Bugzilla->params->{'urlbase'} 
-                             . "query.cgi?format=advanced&amp;"
+        print $cgi->redirect(-uri => "${urlbase}query.cgi?format=advanced&amp;"
                              . $modified_query_string);
     }
 
-- 
cgit v1.2.3-24-g4f1b