priorities "regular" components to be compatible with existing cpan and darkpan

diff --git a/Changes b/Changes
index 49d101d..adf5d1b 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,8 +1,12 @@
 # This file documents the revision history for Perl extension Catalyst.
 
-5.90092 - 2015-05-XX
+5.90092 - 2015-05-19
   - Allows you to use a namespace suffix for request, response and stats
     class traits.  Docs and tests for this.
+  - Refactor the change introduced in 5.90091 to solve reported issues (for
+    example Catalyst::Controller::DBIC::API fails its tests) and to be a more
+    conservative refactor (new code more closely resembles the orginal code
+    that has proven to work for years.)
 
 5.90091 - 2015-05-08
   - Fixed a bug where if an injected component expanded sub components, those

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index ff4ad24..1512c12 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -2919,7 +2919,7 @@ sub setup_components {
     my @injected = $class->setup_injected_components;
 
     # All components are registered, now we need to 'init' them.
-    foreach my $component_name (@injected, @comps) {
+    foreach my $component_name (@comps, @injected) {
       $class->components->{$component_name} = $class->components->{$component_name}->() if
         (ref($class->components->{$component_name}) || '') eq 'CODE';
     }