From 0ba623b78ff3e5251ee6339ded8adb59ccca52f4 Mon Sep 17 00:00:00 2001 From: Frédéric Buclin Date: Thu, 25 Jul 2013 01:44:09 +0200 Subject: Bug 897426: Revert the hack in Bugzilla->feature and make it more robust r/a=glob --- Bugzilla.pm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'Bugzilla.pm') 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; -- cgit v1.2.3-24-g4f1b