added call from sub components

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index d36979d..7861b5f 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -1473,7 +1473,13 @@ sub components {
         $container->add_component( $_ ) for keys %$comps;
     }
 
-    return $container->get_all_components($class);
+    # 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);
 }
 
 =head2 $c->context_class