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/abstract_controller/rendering.rb | |
| 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/abstract_controller/rendering.rb')
| -rw-r--r-- | actionpack/lib/abstract_controller/rendering.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb index bca0dcffd8..ddc93464cd 100644 --- a/actionpack/lib/abstract_controller/rendering.rb +++ b/actionpack/lib/abstract_controller/rendering.rb @@ -165,9 +165,6 @@ module AbstractController options[:prefixes] ||= _prefixes end - options[:text] = nil if options.delete(:nothing) == true - options[:text] = " " if options.key?(:text) && options[:text].nil? - options[:template] ||= (options[:action] || action_name).to_s options end |