aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-03-30 17:22:05 +0200
committerJosé Valim <jose.valim@gmail.com>2011-03-30 17:22:05 +0200
commitba51aa0b1ba7488011388ed4cf33f72917da0729 (patch)
treebad7b1d9e29e6ce31f2d618074f53de223b68828 /actionpack/lib/action_controller
parent58becf116580c37c63b89f4a660ebe293f6e7c4e (diff)
downloadrails-ba51aa0b1ba7488011388ed4cf33f72917da0729.tar.gz
rails-ba51aa0b1ba7488011388ed4cf33f72917da0729.tar.bz2
rails-ba51aa0b1ba7488011388ed4cf33f72917da0729.zip
Make action_method? public and change implicit rendering to override it instead.
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/metal/implicit_render.rb6
1 files changed, 2 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/metal/implicit_render.rb b/actionpack/lib/action_controller/metal/implicit_render.rb
index 4b301c0d90..678f4ca763 100644
--- a/actionpack/lib/action_controller/metal/implicit_render.rb
+++ b/actionpack/lib/action_controller/metal/implicit_render.rb
@@ -14,10 +14,8 @@ module ActionController
render
end
- def method_for_action(action_name)
- super || if template_exists?(action_name.to_s, _prefixes)
- action_name.to_s
- end
+ def action_method?(action_name)
+ super || template_exists?(action_name.to_s, _prefixes)
end
end
end