prettier lists

[catagits/Catalyst-Runtime.git] / lib / Catalyst.pm

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index e7cf1d5..1a7b672 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -144,17 +144,17 @@ sub import {
         $caller->log->debug('Debug messages enabled');
     }
 
-    my $engine ='Catalyst::Engine::CGI';
+    my $engine = 'Catalyst::Engine::CGI';
 
     if ( $ENV{MOD_PERL} ) {
 
         require mod_perl;
 
         if ( $mod_perl::VERSION >= 1.99 ) {
-            $engine ='Catalyst::Engine::Apache::MP2';
+            $engine = 'Catalyst::Engine::Apache::MP2';
         }
         else {
-            $engine ='Catalyst::Engine::Apache::MP1';
+            $engine = 'Catalyst::Engine::Apache::MP1';
         }
     }
 
@@ -171,13 +171,13 @@ sub import {
         else {
             my $plugin = "Catalyst::Plugin::$_";
 
-            # Plugin caller should be our application class
-            eval "package $caller; require $plugin";
+            $plugin->require;
+
             if ($@) {
                 $caller->log->error(qq/Couldn't load plugin "$plugin", "$@"/);
             }
             else {
-                push @plugins, "  $plugin";
+                push @plugins, "  + $plugin";
                 no strict 'refs';
                 push @{"$caller\::ISA"}, $plugin;
             }