Commit 0cb96841 authored by mkanat%bugzilla.org's avatar mkanat%bugzilla.org

Bug 342410: Various modules assume functions are in global scope, when none are

Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=LpSolit, a=justdave
parent b74f46a8
...@@ -32,6 +32,7 @@ use lib "."; ...@@ -32,6 +32,7 @@ use lib ".";
# the same points. # the same points.
package Bugzilla::Chart; package Bugzilla::Chart;
use Bugzilla::Error;
use Bugzilla::Util; use Bugzilla::Util;
use Bugzilla::Series; use Bugzilla::Series;
...@@ -75,7 +76,7 @@ sub init { ...@@ -75,7 +76,7 @@ sub init {
if ($param =~ /^line(\d+)$/) { if ($param =~ /^line(\d+)$/) {
foreach my $series_id ($cgi->param($param)) { foreach my $series_id ($cgi->param($param)) {
detaint_natural($series_id) detaint_natural($series_id)
|| &::ThrowCodeError("invalid_series_id"); || ThrowCodeError("invalid_series_id");
my $series = new Bugzilla::Series($series_id); my $series = new Bugzilla::Series($series_id);
push(@{$self->{'lines'}[$1]}, $series) if $series; push(@{$self->{'lines'}[$1]}, $series) if $series;
} }
...@@ -101,7 +102,7 @@ sub init { ...@@ -101,7 +102,7 @@ sub init {
foreach my $date ('datefrom', 'dateto') { foreach my $date ('datefrom', 'dateto') {
if ($self->{$date}) { if ($self->{$date}) {
$self->{$date} = str2time($self->{$date}) $self->{$date} = str2time($self->{$date})
|| &::ThrowUserError("illegal_date", { date => $self->{$date}}); || ThrowUserError("illegal_date", { date => $self->{$date}});
} }
} }
...@@ -109,7 +110,7 @@ sub init { ...@@ -109,7 +110,7 @@ sub init {
if ($self->{'datefrom'} && $self->{'dateto'} && if ($self->{'datefrom'} && $self->{'dateto'} &&
$self->{'datefrom'} > $self->{'dateto'}) $self->{'datefrom'} > $self->{'dateto'})
{ {
&::ThrowUserError("misarranged_dates", ThrowUserError("misarranged_dates",
{'datefrom' => $cgi->param('datefrom'), {'datefrom' => $cgi->param('datefrom'),
'dateto' => $cgi->param('dateto')}); 'dateto' => $cgi->param('dateto')});
} }
......
...@@ -1007,8 +1007,8 @@ sub match_field { ...@@ -1007,8 +1007,8 @@ sub match_field {
} }
my $limit = 0; my $limit = 0;
if (&::Param('maxusermatches')) { if (Param('maxusermatches')) {
$limit = &::Param('maxusermatches') + 1; $limit = Param('maxusermatches') + 1;
} }
for my $query (@queries) { for my $query (@queries) {
...@@ -1039,16 +1039,16 @@ sub match_field { ...@@ -1039,16 +1039,16 @@ sub match_field {
$cgi->append(-name=>$field, $cgi->append(-name=>$field,
-values=>[@{$users}[0]->{'login'}]); -values=>[@{$users}[0]->{'login'}]);
$need_confirm = 1 if &::Param('confirmuniqueusermatch'); $need_confirm = 1 if Param('confirmuniqueusermatch');
} }
elsif ((scalar(@{$users}) > 1) elsif ((scalar(@{$users}) > 1)
&& (&::Param('maxusermatches') != 1)) { && (Param('maxusermatches') != 1)) {
$need_confirm = 1; $need_confirm = 1;
$match_multiple = 1; $match_multiple = 1;
if ((&::Param('maxusermatches')) if ((Param('maxusermatches'))
&& (scalar(@{$users}) > &::Param('maxusermatches'))) && (scalar(@{$users}) > Param('maxusermatches')))
{ {
$matches->{$field}->{$query}->{'status'} = 'trunc'; $matches->{$field}->{$query}->{'status'} = 'trunc';
pop @{$users}; # take the last one out pop @{$users}; # take the last one out
...@@ -1265,7 +1265,7 @@ sub get_userlist { ...@@ -1265,7 +1265,7 @@ sub get_userlist {
my $dbh = Bugzilla->dbh; my $dbh = Bugzilla->dbh;
my $query = "SELECT DISTINCT login_name, realname,"; my $query = "SELECT DISTINCT login_name, realname,";
if (&::Param('usevisibilitygroups')) { if (Param('usevisibilitygroups')) {
$query .= " COUNT(group_id) "; $query .= " COUNT(group_id) ";
} else { } else {
$query .= " 1 "; $query .= " 1 ";
......
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