summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormkanat%bugzilla.org <>2006-06-26 19:06:47 +0200
committermkanat%bugzilla.org <>2006-06-26 19:06:47 +0200
commit0cb96841eef5fe65ba5dcf704ac2012af839feef (patch)
tree91c26aaf260e36bcd6dfaa8e9bd201ead17b041c
parentb74f46a8039ebb62472a48a50139f696e6b6d0c7 (diff)
downloadbugzilla-0cb96841eef5fe65ba5dcf704ac2012af839feef.tar.gz
bugzilla-0cb96841eef5fe65ba5dcf704ac2012af839feef.tar.xz
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
-rw-r--r--Bugzilla/Chart.pm7
-rw-r--r--Bugzilla/User.pm14
2 files changed, 11 insertions, 10 deletions
diff --git a/Bugzilla/Chart.pm b/Bugzilla/Chart.pm
index c878186bc..b2db9da30 100644
--- a/Bugzilla/Chart.pm
+++ b/Bugzilla/Chart.pm
@@ -32,6 +32,7 @@ use lib ".";
# the same points.
package Bugzilla::Chart;
+use Bugzilla::Error;
use Bugzilla::Util;
use Bugzilla::Series;
@@ -75,7 +76,7 @@ sub init {
if ($param =~ /^line(\d+)$/) {
foreach my $series_id ($cgi->param($param)) {
detaint_natural($series_id)
- || &::ThrowCodeError("invalid_series_id");
+ || ThrowCodeError("invalid_series_id");
my $series = new Bugzilla::Series($series_id);
push(@{$self->{'lines'}[$1]}, $series) if $series;
}
@@ -101,7 +102,7 @@ sub init {
foreach my $date ('datefrom', 'dateto') {
if ($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 {
if ($self->{'datefrom'} && $self->{'dateto'} &&
$self->{'datefrom'} > $self->{'dateto'})
{
- &::ThrowUserError("misarranged_dates",
+ ThrowUserError("misarranged_dates",
{'datefrom' => $cgi->param('datefrom'),
'dateto' => $cgi->param('dateto')});
}
diff --git a/Bugzilla/User.pm b/Bugzilla/User.pm
index c26f64332..7ad1593ce 100644
--- a/Bugzilla/User.pm
+++ b/Bugzilla/User.pm
@@ -1007,8 +1007,8 @@ sub match_field {
}
my $limit = 0;
- if (&::Param('maxusermatches')) {
- $limit = &::Param('maxusermatches') + 1;
+ if (Param('maxusermatches')) {
+ $limit = Param('maxusermatches') + 1;
}
for my $query (@queries) {
@@ -1039,16 +1039,16 @@ sub match_field {
$cgi->append(-name=>$field,
-values=>[@{$users}[0]->{'login'}]);
- $need_confirm = 1 if &::Param('confirmuniqueusermatch');
+ $need_confirm = 1 if Param('confirmuniqueusermatch');
}
elsif ((scalar(@{$users}) > 1)
- && (&::Param('maxusermatches') != 1)) {
+ && (Param('maxusermatches') != 1)) {
$need_confirm = 1;
$match_multiple = 1;
- if ((&::Param('maxusermatches'))
- && (scalar(@{$users}) > &::Param('maxusermatches')))
+ if ((Param('maxusermatches'))
+ && (scalar(@{$users}) > Param('maxusermatches')))
{
$matches->{$field}->{$query}->{'status'} = 'trunc';
pop @{$users}; # take the last one out
@@ -1265,7 +1265,7 @@ sub get_userlist {
my $dbh = Bugzilla->dbh;
my $query = "SELECT DISTINCT login_name, realname,";
- if (&::Param('usevisibilitygroups')) {
+ if (Param('usevisibilitygroups')) {
$query .= " COUNT(group_id) ";
} else {
$query .= " 1 ";