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 --- query.cgi | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) (limited to 'query.cgi') diff --git a/query.cgi b/query.cgi index b82504808..1ab53a9b8 100755 --- a/query.cgi +++ b/query.cgi @@ -37,15 +37,7 @@ use Bugzilla::User; use Bugzilla::Util; use Bugzilla::Product; use Bugzilla::Keyword; - -use vars qw( - @legal_resolution - @legal_bug_status - @legal_opsys - @legal_platform - @legal_priority - @legal_severity -); +use Bugzilla::Field; my $cgi = Bugzilla->cgi; my $dbh = Bugzilla->dbh; @@ -240,12 +232,10 @@ if (Param('usetargetmilestone')) { $vars->{'have_keywords'} = Bugzilla::Keyword::keyword_count(); -GetVersionTable(); - -push @::legal_resolution, "---"; # Oy, what a hack. -shift @::legal_resolution; - # Another hack - this array contains "" for some reason. See bug 106589. -$vars->{'resolution'} = \@::legal_resolution; +my $legal_resolutions = get_legal_field_values('resolution'); +push(@$legal_resolutions, "---"); # Oy, what a hack. +# Another hack - this array contains "" for some reason. See bug 106589. +$vars->{'resolution'} = [grep ($_, @$legal_resolutions)]; my @chfields; @@ -272,11 +262,11 @@ if (UserInGroup(Param('timetrackinggroup'))) { } @chfields = (sort(@chfields)); $vars->{'chfield'} = \@chfields; -$vars->{'bug_status'} = \@::legal_bug_status; -$vars->{'rep_platform'} = \@::legal_platform; -$vars->{'op_sys'} = \@::legal_opsys; -$vars->{'priority'} = \@::legal_priority; -$vars->{'bug_severity'} = \@::legal_severity; +$vars->{'bug_status'} = get_legal_field_values('bug_status'); +$vars->{'rep_platform'} = get_legal_field_values('rep_platform'); +$vars->{'op_sys'} = get_legal_field_values('op_sys'); +$vars->{'priority'} = get_legal_field_values('priority'); +$vars->{'bug_severity'} = get_legal_field_values('bug_severity'); # Boolean charts my @fields; -- cgit v1.2.3-24-g4f1b