Commit e2efa454 authored by lpsolit%gmail.com's avatar lpsolit%gmail.com

Bug 338869: The 'quicksearch' field in the footer redirects to http:// even when…

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
parent 90407fca
...@@ -28,6 +28,7 @@ use Bugzilla::Constants; ...@@ -28,6 +28,7 @@ use Bugzilla::Constants;
use Bugzilla::Keyword; use Bugzilla::Keyword;
use Bugzilla::Bug; use Bugzilla::Bug;
use Bugzilla::Field; use Bugzilla::Field;
use Bugzilla::Util;
use base qw(Exporter); use base qw(Exporter);
@Bugzilla::Search::Quicksearch::EXPORT = qw(quicksearch); @Bugzilla::Search::Quicksearch::EXPORT = qw(quicksearch);
...@@ -106,6 +107,7 @@ our ($chart, $and, $or); ...@@ -106,6 +107,7 @@ our ($chart, $and, $or);
sub quicksearch { sub quicksearch {
my ($searchstring) = (@_); my ($searchstring) = (@_);
my $cgi = Bugzilla->cgi; my $cgi = Bugzilla->cgi;
my $urlbase = correct_urlbase();
$chart = 0; $chart = 0;
$and = 0; $and = 0;
...@@ -123,8 +125,7 @@ sub quicksearch { ...@@ -123,8 +125,7 @@ sub quicksearch {
if (index($searchstring, ',') < $[) { if (index($searchstring, ',') < $[) {
# Single bug number; shortcut to show_bug.cgi. # Single bug number; shortcut to show_bug.cgi.
print $cgi->redirect(-uri => Bugzilla->params->{'urlbase'} . print $cgi->redirect(-uri => "${urlbase}show_bug.cgi?id=$searchstring");
"show_bug.cgi?id=$searchstring");
exit; exit;
} }
else { else {
...@@ -143,8 +144,7 @@ sub quicksearch { ...@@ -143,8 +144,7 @@ sub quicksearch {
WHERE alias = ?}, WHERE alias = ?},
undef, undef,
$1)) { $1)) {
print $cgi->redirect(-uri => Bugzilla->params->{'urlbase'} . print $cgi->redirect(-uri => "${urlbase}show_bug.cgi?id=$1");
"show_bug.cgi?id=$1");
exit; exit;
} }
} }
...@@ -387,8 +387,7 @@ sub quicksearch { ...@@ -387,8 +387,7 @@ sub quicksearch {
if ($cgi->param('load')) { if ($cgi->param('load')) {
# Param 'load' asks us to display the query in the advanced search form. # Param 'load' asks us to display the query in the advanced search form.
print $cgi->redirect(-uri => Bugzilla->params->{'urlbase'} print $cgi->redirect(-uri => "${urlbase}query.cgi?format=advanced&amp;"
. "query.cgi?format=advanced&amp;"
. $modified_query_string); . $modified_query_string);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment