[Catalyst-commits] r13107 - Catalyst-Runtime/5.80/trunk/lib

[rafl at dev.catalyst.perl.org]

Author: rafl
Date: 2010-03-29 17:19:15 +0100 (Mon, 29 Mar 2010)
New Revision: 13107

Modified:
   Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm
Log:
We always have a metaclass after setup, right?

Modified: Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm	2010-03-29 16:09:05 UTC (rev 13106)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm	2010-03-29 16:19:15 UTC (rev 13107)
@@ -2787,13 +2787,8 @@
             if $plugin->isa( 'Catalyst::Component' );
         $proto->_plugins->{$plugin} = 1;
         unless ($instant) {
-            no strict 'refs';
-            if ( my $meta = Class::MOP::get_metaclass_by_name($class) ) {
-              my @superclasses = ($plugin, $meta->superclasses );
-              $meta->superclasses(@superclasses);
-            } else {
-              unshift @{"$class\::ISA"}, $plugin;
-            }
+            my $meta = Class::MOP::get_metaclass_by_name($class);
+            $meta->superclasses($plugin, $meta->superclasses);
         }
         return $class;
     }