X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst.pm;h=877c53c438ef80e9720aa08459228091a60d80bb;hp=137e6188aa2e26a4c043e3e88258570a449d04df;hb=5d8129e9b7bea385dd6fda9b490e7923f61eedd0;hpb=f66edc15eb31d30fbbe720760db712c50288e953 diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm index 137e618..877c53c 100644 --- a/lib/Catalyst.pm +++ b/lib/Catalyst.pm @@ -76,7 +76,7 @@ __PACKAGE__->stats_class('Catalyst::Stats'); # Remember to update this in Catalyst::Runtime as well! -our $VERSION = '5.80004'; +our $VERSION = '5.80005'; { my $dev_version = $VERSION =~ /_\d{2}$/; @@ -2502,14 +2502,11 @@ the plugin name does not begin with C. $class->_plugins( {} ) unless $class->_plugins; $plugins ||= []; - - my @plugins = map { s/\A\+// ? $_ : "Catalyst::Plugin::$_" } @$plugins; + + my @plugins = Catalyst::Utils::resolve_namespace($class . '::Plugin', 'Catalyst::Plugin', @$plugins); - for my $plugin (@plugins) { - Class::MOP::load_class($plugin); - } - for my $plugin ( reverse @plugins ) { + Class::MOP::load_class($plugin); my $meta = find_meta($plugin); next if $meta && $meta->isa('Moose::Meta::Role');