X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=a19de10f20db531f0e092251ba805d05db63d90e;hb=10c4d3b090ae82398a7939d6ead79d40937ed834;hp=b03920f5128b261eb2f2bde6ca3b9076c154826e;hpb=0dff29e23f9c1f2c7e4ecca2283cf02c495ad73b;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index b03920f..a19de10 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -2349,10 +2349,9 @@ sub setup_components {
     my $container = $class->container;
 
     for my $component (@comps) {
-        my $instance = $container->add_component( $component, $class );
-        my @expanded_components = $instance->can('expand_modules')
-            ? $instance->expand_modules( $component, $config )
-            : $class->expand_component_module( $component, $config );
+        $container->add_component( $component, $class );
+# FIXME - $instance->expand_modules() is broken
+        my @expanded_components = $class->expand_component_module( $component, $config );
         for my $component (@expanded_components) {
             next if $comps{$component};