Merge branch 'ancona' into ancona-trace

[catagits/Catalyst-Runtime.git] / lib / Catalyst / Controller.pm

diff --git a/lib/Catalyst/Controller.pm b/lib/Catalyst/Controller.pm
index 9c3cb2a..edda9db 100644 (file)
--- a/lib/Catalyst/Controller.pm
+++ b/lib/Catalyst/Controller.pm
@@ -278,10 +278,9 @@ sub register_action_methods {
         my $attributes = $method->can('attributes') ? $method->attributes : [];
         my $attrs = $self->_parse_attrs( $c, $name, @{ $attributes } );
         if ( $attrs->{Private} && ( keys %$attrs > 1 ) ) {
-            $c->log->warn( 'Bad action definition "'
+            $c->trace(1, 'Bad action definition "'
                   . join( ' ', @{ $attributes } )
-                  . qq/" for "$class->$name"/ )
-              if $c->debug;
+                  . qq/" for "$class->$name"/ );
             next;
         }
         my $reverse = $namespace ? "${namespace}/${name}" : $name;
@@ -712,7 +711,7 @@ similar to how annotations work in other languages you might have heard of.
 Generally L<Catalyst> uses these to influence how the dispatcher sees your
 action and when it will run it in response to an incoming request.  They can
 also be used for other things.  Here's a summary, but you should refer to the
-liked manual page for additional help.
+linked manual page for additional help.
 
 =head2 Global