Merge 'deprecate_appclass_actions' into 'trunk'

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

diff --git a/lib/Catalyst/Controller.pm b/lib/Catalyst/Controller.pm
index dc68a33..6d3c85a 100644 (file)
--- a/lib/Catalyst/Controller.pm
+++ b/lib/Catalyst/Controller.pm
@@ -215,10 +215,9 @@ sub register_action_methods {
     #this is still not correct for some reason.
     my $namespace = $self->action_namespace($c);
 
-    # Uncomment as soon as you fix the tests :)
-    #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.");
-    #}
+    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.");
+    }
 
     foreach my $method (@methods) {
         my $name = $method->name;