X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst.pm;fp=lib%2FCatalyst.pm;h=70d6ac3bcc6140ae56784a1fa720fb85f735d225;hp=7861b5f2893fdaa293e9eb7b5f2359629bbaf6ea;hb=aba0841d12cbaa53592f6792ca4ff175070fd86a;hpb=8c199f8627c2d972d06aa0a98337ff7ba922d9af 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