[Catalyst-commits] r10349 - in Catalyst-Runtime/5.80/trunk: . lib

[t0m at dev.catalyst.perl.org]

Author: t0m
Date: 2009-05-29 00:12:52 +0000 (Fri, 29 May 2009)
New Revision: 10349

Modified:
   Catalyst-Runtime/5.80/trunk/Changes
   Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm
Log:
And trivial fix by not using up

Modified: Catalyst-Runtime/5.80/trunk/Changes
===================================================================
--- Catalyst-Runtime/5.80/trunk/Changes	2009-05-29 00:09:11 UTC (rev 10348)
+++ Catalyst-Runtime/5.80/trunk/Changes	2009-05-29 00:12:52 UTC (rev 10349)
@@ -12,6 +12,9 @@
           to make $c->engine->env work in all cases (kmx)
         - Also fix $c->engine->env in Catalyst::Test tests (kmx)
           - Tests for this (t0m)
+        - Fix Catalyst failing to start if any plugin changed $_ whilst
+          loading (t0m)
+          - Tests for this
 
    New features:
         - Add $c->req->remote_user to disambiguate from $c->req->user (dwc)

Modified: Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm	2009-05-29 00:09:11 UTC (rev 10348)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm	2009-05-29 00:12:52 UTC (rev 10349)
@@ -2505,8 +2505,10 @@
 
         my @plugins = map { s/\A\+// ? $_ : "Catalyst::Plugin::$_" } @$plugins;
         
-        Class::MOP::load_class($_) for @plugins;
-        
+        for my $plugin (@plugins) {
+            Class::MOP::load_class($plugin);
+        }
+
         for my $plugin ( reverse @plugins ) {
             my $meta = find_meta($plugin);
             next if $meta && $meta->isa('Moose::Meta::Role');