diff options
| author | José Valim <jose.valim@gmail.com> | 2012-01-19 12:55:31 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-01-19 12:55:31 -0800 |
| commit | 16bd0cb1f08569402cccc9b7f00f0b274e327eb9 (patch) | |
| tree | 9ef1dda909373e556c8ccec5664196ed2f5536e3 /actionpack/lib/action_controller/metal | |
| parent | 0a3f57e85a0825f31d93303eb6f2c7f40fce57f8 (diff) | |
| parent | 1b4edd173dc2cbe53e48777d3e17be3164513539 (diff) | |
| download | rails-16bd0cb1f08569402cccc9b7f00f0b274e327eb9.tar.gz rails-16bd0cb1f08569402cccc9b7f00f0b274e327eb9.tar.bz2 rails-16bd0cb1f08569402cccc9b7f00f0b274e327eb9.zip | |
Merge pull request #4546 from carlosantoniodasilva/response-body-performed
Use performed? instead of checking for response_body
Diffstat (limited to 'actionpack/lib/action_controller/metal')
| -rw-r--r-- | actionpack/lib/action_controller/metal/implicit_render.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/implicit_render.rb b/actionpack/lib/action_controller/metal/implicit_render.rb index e8e465d3ba..ae04b53825 100644 --- a/actionpack/lib/action_controller/metal/implicit_render.rb +++ b/actionpack/lib/action_controller/metal/implicit_render.rb @@ -2,7 +2,7 @@ module ActionController module ImplicitRender def send_action(method, *args) ret = super - default_render unless response_body + default_render unless performed? ret end |