Skip to content

bugzilla
bugzilla
Commit 42183949 authored by mkanat%kerio.com's avatar mkanat%kerio.com
Browse files
Options

Bug 283019: Stop Bugzilla::Config.pm from use-ing Bugzilla::Util

Patch By Marc Schumann <wurblzap@gmail.com> r=LpSolit, a=myk
parent 518c6ffa
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
Bugzilla/Config.pm
View file @ 42183949
...@@ -33,8 +33,6 @@ use strict; ...@@ -33,8 +33,6 @@ use strict;
use base qw(Exporter); use base qw(Exporter);
use Bugzilla::Util;
# Under mod_perl, get this from a .htaccess config variable, # Under mod_perl, get this from a .htaccess config variable,
# and/or default from the current 'real' dir # and/or default from the current 'real' dir
# At some stage after this, it may be possible for these dir locations # At some stage after this, it may be possible for these dir locations
...@@ -307,7 +305,7 @@ sub check_multi { ...@@ -307,7 +305,7 @@ sub check_multi {
my ($value, $param) = (@_); my ($value, $param) = (@_);
if ($param->{'type'} eq "s") { if ($param->{'type'} eq "s") {
unless (lsearch($param->{'choices'}, $value) >= 0) { unless (scalar(grep {$_ eq $value} (@{$param->{'choices'}}))) {
return "Invalid choice '$value' for single-select list param '$param'"; return "Invalid choice '$value' for single-select list param '$param'";
} }
...@@ -315,7 +313,7 @@ sub check_multi { ...@@ -315,7 +313,7 @@ sub check_multi {
} }
elsif ($param->{'type'} eq "m") { elsif ($param->{'type'} eq "m") {
foreach my $chkParam (@$value) { foreach my $chkParam (@$value) {
unless (lsearch($param->{'choices'}, $chkParam) >= 0) { unless (scalar(grep {$_ eq $chkParam} (@{$param->{'choices'}}))) {
return "Invalid choice '$chkParam' for multi-select list param '$param'"; return "Invalid choice '$chkParam' for multi-select list param '$param'";
} }
} }
......
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