Skip to content
This repository
Browse code

render :nothing shouldnt cause layouts

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1353 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit bdd16a75e6ee5ec420bec1ca441e97b403dfb9d4 1 parent 060ecf1
David Heinemeier Hansson dhh authored

Showing 1 changed file with 1 addition and 1 deletion. Show diff stats Hide diff stats

  1. +1 1  actionpack/lib/action_controller/layout.rb
2  actionpack/lib/action_controller/layout.rb
@@ -218,7 +218,7 @@ def render_with_a_layout(options = {}, deprecated_status = nil, deprecated_layou
218 218
219 219 private
220 220 def pick_layout(options = {}, deprecated_layout = nil)
221   - return deprecated_layout unless deprecated_layout.nil?
  221 + return deprecated_layout if !deprecated_layout.nil? || (options.is_a?(Hash) && options[:nothing])
222 222
223 223 if options.is_a?(Hash)
224 224 case options[:layout]

0 comments on commit bdd16a7

Please sign in to comment.
Something went wrong with that request. Please try again.