From 2545c0950c4f0fde8f78b265217fa9f523eff7bf Mon Sep 17 00:00:00 2001 From: "lpsolit%gmail.com" <> Date: Tue, 20 Jun 2006 03:15:17 +0000 Subject: Bug 304601: Bugzilla::Config's :locations exports need to be in their own module - Patch by Frédéric Buclin r=mkanat for the main patch, r=myk for the patch about CGI.pm a=justdave MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug 328637: Remove all legal_* versioncache arrays - Patch by Frédéric Buclin r=mkanat a=justdave Bug 110503 - Eliminate versioncache --- Bugzilla/CGI.pm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'Bugzilla/CGI.pm') diff --git a/Bugzilla/CGI.pm b/Bugzilla/CGI.pm index ca062f9d3..688878b19 100644 --- a/Bugzilla/CGI.pm +++ b/Bugzilla/CGI.pm @@ -40,7 +40,6 @@ use CGI::Carp qw(fatalsToBrowser); use Bugzilla::Error; use Bugzilla::Util; -use Bugzilla::Config; # We need to disable output buffering - see bug 179174 $| = 1; @@ -79,11 +78,14 @@ sub new { $self->{Bugzilla_cookie_list} = []; # Send appropriate charset - $self->charset(Param('utf8') ? 'UTF-8' : ''); + $self->charset(Bugzilla->params->{'utf8'} ? 'UTF-8' : ''); # Redirect to SSL if required - if (Param('sslbase') ne '' and Param('ssl') eq 'always' and i_am_cgi()) { - $self->require_https(Param('sslbase')); + if (Bugzilla->params->{'sslbase'} ne '' + && Bugzilla->params->{'ssl'} eq 'always' + && i_am_cgi()) + { + $self->require_https(Bugzilla->params->{'sslbase'}); } # Check for errors @@ -221,8 +223,9 @@ sub send_cookie { } # Add the default path and the domain in. - $paramhash{'-path'} = Param('cookiepath'); - $paramhash{'-domain'} = Param('cookiedomain') if Param('cookiedomain'); + $paramhash{'-path'} = Bugzilla->params->{'cookiepath'}; + $paramhash{'-domain'} = Bugzilla->params->{'cookiedomain'} + if Bugzilla->params->{'cookiedomain'}; # Move the param list back into an array for the call to cookie(). foreach (keys(%paramhash)) { -- cgit v1.2.3-24-g4f1b