X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst.pm;h=42dabb87c0e17e5b77e3415c48506c13238f11ae;hp=9f2f83676bad412744c8e424091e7a0fbc2efa3a;hb=7a1a325a72e9a197866000cfab091a4f660ce348;hpb=58541c41f8a186f0ede06ffb2e048639041f7f60

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 9f2f836..42dabb8 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -2811,8 +2811,8 @@ the plugin name does not begin with C<Catalyst::Plugin::>.
          } @{ $plugins };
 
         for my $plugin ( reverse @plugins ) {
-            Class::MOP::load_class($plugin->[0]);
             # pass along $plugin->[1] as well once cmop supports it
+            Class::MOP::load_class($plugin->[0]);
             my $meta = find_meta($plugin->[0]);
             next if $meta && $meta->isa('Moose::Meta::Role');
 
@@ -2820,9 +2820,9 @@ the plugin name does not begin with C<Catalyst::Plugin::>.
         }
 
         my @roles =
-            map { $_->[0]->name, $_->[1] }
-            grep { $_->[0] && blessed($_->[0]) && $_->[0]->isa('Moose::Meta::Role') }
-            map { [find_meta($_->[0]), $_->[1]] }
+            map  { $_->[0]->name, $_->[1] }
+            grep { blessed($_->[0]) && $_->[0]->isa('Moose::Meta::Role') }
+            map  { [find_meta($_->[0]), $_->[1]] }
             @plugins;
 
         Moose::Util::apply_all_roles(