diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-01-15 15:37:27 -0200 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-01-17 10:04:38 -0200 |
| commit | 53596d091390bda7fb9b78ad838273a9e63fbde1 (patch) | |
| tree | 85cb372492de6e8e9191afad2322691969eb8dc3 /actionpack/lib/action_controller/metal | |
| parent | 6244d16eaf8eea9ce963f08dced60399b121a6dc (diff) | |
| download | rails-53596d091390bda7fb9b78ad838273a9e63fbde1.tar.gz rails-53596d091390bda7fb9b78ad838273a9e63fbde1.tar.bz2 rails-53596d091390bda7fb9b78ad838273a9e63fbde1.zip | |
Refactor render nothing/text => nil logic, and move to right place
Options :nothing and :text => nil should be handled by
ActionController::Rendering instead.
Diffstat (limited to 'actionpack/lib/action_controller/metal')
| -rw-r--r-- | actionpack/lib/action_controller/metal/rendering.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb index 70fd79bb8b..f6e9e4c4ac 100644 --- a/actionpack/lib/action_controller/metal/rendering.rb +++ b/actionpack/lib/action_controller/metal/rendering.rb @@ -44,6 +44,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 |