X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=70d6ac3bcc6140ae56784a1fa720fb85f735d225;hb=refs%2Fheads%2Fgsoc_breadboard_split_get_all_components;hp=7861b5f2893fdaa293e9eb7b5f2359629bbaf6ea;hpb=1601aed5f75e09f1190a3f9a16cdd32df11834d1;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 7861b5f..70d6ac3 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -1473,13 +1473,10 @@ sub components {
         $container->add_component( $_ ) for keys %$comps;
     }
 
-    # FIXME:
-    # t0m says should be "ref($c) ? $c->container->get_all_singleton_lifecycle_components : $c->container->get_all_components($c)".
-    # are you sure? isn't it the other way around?
-    # i.e. ref($c) ? get_all_components($c) : get_all_singleton_lifecycle_components()
     return
-        ref($class) ? $container->get_all_singleton_lifecycle_components
-                    : $container->get_all_components($class);
+        ref($class) ? $container->get_all_components($class)
+                    : $container->get_all_singleton_lifecycle_components
+                    ;
 }
 
 =head2 $c->context_class