revert MyApp instantiation

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

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 0083d0d..28b8a27 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -1,6 +1,7 @@
 package Catalyst;
 
-use Class::C3;
+use MRO::Compat;
+use mro 'c3';
 use Moose;
 extends 'Catalyst::Component';
 use bytes;
@@ -813,7 +814,7 @@ Catalyst> line.
 
 sub setup {
     my ( $class, @arguments ) = @_;
-
+    Class::C3::initialize;
     $class->log->warn("Running setup twice is not a good idea.")
       if ( $class->setup_finished );
 
@@ -922,7 +923,9 @@ EOF
     }
 
     # Add our self to components, since we are also a component
-    $class->components->{$class} = $class->setup_component($class);
+    if( $class->isa('Catalyst::Controller') ){
+      $class->components->{$class} = $class;
+    }
 
     $class->setup_actions;
 
@@ -933,6 +936,7 @@ EOF
     $class->log->_flush() if $class->log->can('_flush');
 
     $class->setup_finished(1);
+    Class::C3::initialize;
 }
 
 =head2 $c->uri_for( $path, @args?, \%query_values? )