github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-24 13:58:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

render :nothing shouldnt cause layouts

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1353 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
David Heinemeier Hansson
2005-05-22 16:57:51 +00:00
parent 060ecf1a24
commit bdd16a75e6
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
actionpack/lib/action_controller/layout.rb
View File

@@ -218,7 +218,7 @@ module ActionController #:nodoc:
private
def pick_layout(options = {}, deprecated_layout = nil)
return deprecated_layout unless deprecated_layout.nil?
return deprecated_layout if !deprecated_layout.nil? || (options.is_a?(Hash) && options[:nothing])
if options.is_a?(Hash)
case options[:layout]