diff options
author | José Valim <jose.valim@gmail.com> | 2012-01-17 12:00:05 -0800 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2012-01-17 12:00:05 -0800 |
commit | ba154bd76fb481d9faca123e988924bd864c0318 (patch) | |
tree | 89cb9542a0717e52477e6c0ae08fd703ce80dd6d /actionpack/lib/action_controller/metal/rendering.rb | |
parent | 422958f17cbe1b6009313b7acd01cc11aacec3d7 (diff) | |
parent | 96a817fb2c5ca32c69469a9d2dc13630d8fa5e8a (diff) | |
download | rails-ba154bd76fb481d9faca123e988924bd864c0318.tar.gz rails-ba154bd76fb481d9faca123e988924bd864c0318.tar.bz2 rails-ba154bd76fb481d9faca123e988924bd864c0318.zip |
Merge pull request #4497 from carlosantoniodasilva/action-controller-refactor
Action controller refactor - remove Compatibility module
Diffstat (limited to 'actionpack/lib/action_controller/metal/rendering.rb')
-rw-r--r-- | actionpack/lib/action_controller/metal/rendering.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb index 70fd79bb8b..a677cdf15d 100644 --- a/actionpack/lib/action_controller/metal/rendering.rb +++ b/actionpack/lib/action_controller/metal/rendering.rb @@ -29,6 +29,10 @@ module ActionController self.response_body = nil end + def render_to_body(*) + super || " " + end + private # Normalize arguments by catching blocks and setting them on :update. @@ -44,6 +48,10 @@ module ActionController options[:text] = options[:text].to_text end + if options.delete(:nothing) || (options.key?(:text) && options[:text].nil?) + options[:text] = " " + end + if options[:status] options[:status] = Rack::Utils.status_code(options[:status]) end |