From: Tomas Doran <bobtfish@bobtfish.net>
Date: Thu, 6 Aug 2009 23:42:29 +0000 (+0000)
Subject: Fix error message
X-Git-Tag: 5.80013~12^2~14
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=f3c5b1c9ec3109944760a437e6d26adb989ab62b;p=catagits%2FCatalyst-Runtime.git

Fix error message
---

diff --git a/lib/Catalyst/Controller.pm b/lib/Catalyst/Controller.pm
index f23ad4a..3f79106 100644
--- a/lib/Catalyst/Controller.pm
+++ b/lib/Catalyst/Controller.pm
@@ -211,8 +211,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) {