X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=c661d7258572d3a0225c738321b28b3e5aefe23e;hb=b39840dab69d787e608212d070f7ab4a29204f5f;hp=8cb5af570ccec64bb4aba3072176d8a8d1bf0b2d;hpb=67c3275d51699ad13bf6a8e8b25f13e8938b8a4c;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 8cb5af5..c661d72 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -54,7 +54,7 @@ __PACKAGE__->engine_class('Catalyst::Engine::CGI');
 __PACKAGE__->request_class('Catalyst::Request');
 __PACKAGE__->response_class('Catalyst::Response');
 
-our $VERSION = '5.52';
+our $VERSION = '5.55';
 
 sub import {
     my ( $class, @arguments ) = @_;
@@ -1496,8 +1496,7 @@ qq/Couldn't instantiate component "$component", "new() didn't return a object"/
         return $instance;
     };
 
-    eval {
-        Module::Pluggable::Fast->import(
+    eval "package $class;\n" . q!Module::Pluggable::Fast->import(
             name   => '_catalyst_components',
             search => [
                 "$class\::Controller", "$class\::C",
@@ -1506,7 +1505,7 @@ qq/Couldn't instantiate component "$component", "new() didn't return a object"/
             ],
             callback => $callback
         );
-    };
+    !;
 
     if ( my $error = $@ ) {