summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrédéric Buclin <LpSolit@gmail.com>2013-07-25 01:44:09 +0200
committerFrédéric Buclin <LpSolit@gmail.com>2013-07-25 01:44:09 +0200
commit0ba623b78ff3e5251ee6339ded8adb59ccca52f4 (patch)
tree51be90798f930f932227484ad753da15c1b12612
parent4843c411f9df6d8ea88c4682bef8ffc92db8388f (diff)
downloadbugzilla-0ba623b78ff3e5251ee6339ded8adb59ccca52f4.tar.gz
bugzilla-0ba623b78ff3e5251ee6339ded8adb59ccca52f4.tar.xz
Bug 897426: Revert the hack in Bugzilla->feature and make it more robust
r/a=glob
-rw-r--r--Bugzilla.pm7
1 files changed, 1 insertions, 6 deletions
diff --git a/Bugzilla.pm b/Bugzilla.pm
index eb1c2f8ea..2c0e303d9 100644
--- a/Bugzilla.pm
+++ b/Bugzilla.pm
@@ -232,12 +232,7 @@ sub feature {
my $success = 1;
foreach my $module (@{ $feature_map->{$feature} }) {
- # We can't use a string eval and "use" here (it kills Template-Toolkit,
- # see https://rt.cpan.org/Public/Bug/Display.html?id=47929), so we have
- # to do a block eval.
- $module =~ s{::}{/}g;
- $module .= ".pm";
- eval { require $module; 1; } or $success = 0;
+ eval "require $module" or $success = 0;
}
$cache->{feature}->{$feature} = $success;
return $success;