prep for release
[catagits/Catalyst-Runtime.git] / lib / Catalyst.pm
index 6d77f40..abf306d 100755 (executable)
@@ -126,7 +126,7 @@ __PACKAGE__->stats_class('Catalyst::Stats');
 
 # Remember to update this in Catalyst::Runtime as well!
 
-our $VERSION = '5.90060';
+our $VERSION = '5.90061';
 
 sub import {
     my ( $class, @arguments ) = @_;
@@ -1133,7 +1133,6 @@ sub setup {
     $class->setup_log( delete $flags->{log} );
     $class->setup_plugins( delete $flags->{plugins} );
 
-    $class->setup_middleware();
     $class->setup_data_handlers();
     $class->setup_dispatcher( delete $flags->{dispatcher} );
     if (my $engine = delete $flags->{engine}) {
@@ -1174,6 +1173,8 @@ EOF
         $class->setup unless $Catalyst::__AM_RESTARTING;
     }
 
+    $class->setup_middleware();
+
     # Initialize our data structure
     $class->components( {} );