diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-03-30 09:55:02 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-03-30 09:55:02 -0700 |
| commit | d688a9d0848b1fd72f89828cb0616d0a1aaeb344 (patch) | |
| tree | 616dabcfb555e6ce6a2455e78705de206097068f /actionpack/lib/action_controller | |
| parent | cfb6f77ac0574d3cd613c99fcc32135016b4284c (diff) | |
| parent | ba51aa0b1ba7488011388ed4cf33f72917da0729 (diff) | |
| download | rails-d688a9d0848b1fd72f89828cb0616d0a1aaeb344.tar.gz rails-d688a9d0848b1fd72f89828cb0616d0a1aaeb344.tar.bz2 rails-d688a9d0848b1fd72f89828cb0616d0a1aaeb344.zip | |
Merge branch 'master' of github.com:rails/rails
* 'master' of github.com:rails/rails:
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.rb | 6 |
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 |