diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-01-15 15:34:50 -0200 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-01-17 10:04:38 -0200 |
| commit | 6244d16eaf8eea9ce963f08dced60399b121a6dc (patch) | |
| tree | d2f7073248cacf3d7a91c2829ee4cb743592ef27 /actionpack/lib/abstract_controller/rendering.rb | |
| parent | 562a12df29b573406b15e9824a8288ad8ee6da83 (diff) | |
| download | rails-6244d16eaf8eea9ce963f08dced60399b121a6dc.tar.gz rails-6244d16eaf8eea9ce963f08dced60399b121a6dc.tar.bz2 rails-6244d16eaf8eea9ce963f08dced60399b121a6dc.zip | |
Move render :nothing and :text => nil options to AC::Rendering
Diffstat (limited to 'actionpack/lib/abstract_controller/rendering.rb')
| -rw-r--r-- | actionpack/lib/abstract_controller/rendering.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb index ddc93464cd..bca0dcffd8 100644 --- a/actionpack/lib/abstract_controller/rendering.rb +++ b/actionpack/lib/abstract_controller/rendering.rb @@ -165,6 +165,9 @@ 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 |