From: Frédéric Buclin <LpSolit@gmail.com>
Date: Wed, 24 Jul 2013 23:44:09 +0000 (+0200)
Subject: Bug 897426: Revert the hack in Bugzilla->feature and make it more robust
X-Git-Tag: bugzilla-4.5.1~118
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ba623b78ff3e5251ee6339ded8adb59ccca52f4;p=thirdparty%2Fbugzilla.git

Bug 897426: Revert the hack in Bugzilla->feature and make it more robust
r/a=glob
---

diff --git a/Bugzilla.pm b/Bugzilla.pm
index eb1c2f8eac..2c0e303d9a 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;