X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FController.pm;h=1d91b3ccf6b9d4df31eb05c0c28511e63e031a74;hb=3a8c155fa0077e949f68f29fbe4b835d5484a2c9;hp=6d3c85a3918811c6d4d5e52b8482fa18e3a35225;hpb=e4d346514a2e0b5d239cc22f28205846d00f93bb;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Controller.pm b/lib/Catalyst/Controller.pm
index 6d3c85a..1d91b3c 100644
--- a/lib/Catalyst/Controller.pm
+++ b/lib/Catalyst/Controller.pm
@@ -215,8 +215,12 @@ sub register_action_methods {
     #this is still not correct for some reason.
     my $namespace = $self->action_namespace($c);
 
+    # FIXME - fugly
     if (!blessed($self) && $self eq $c && scalar(@methods)) {
-        $c->log->warn("Action methods found defined in your application class, $self. This is deprecated, please move them into a Root controller.");
+        my @really_bad_methods = grep { ! /^_(DISPATCH|BEGIN|AUTO|ACTION|END)$/ } map { $_->name } @methods;
+        if (scalar(@really_bad_methods)) {
+            $c->log->warn("Action methods (" . join(', ', @really_bad_methods) . ") found defined in your application class, $self. This is deprecated, please move them into a Root controller.");
+        }
     }
 
     foreach my $method (@methods) {