Permalink
Browse files

render :nothing shouldnt cause layouts

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1353 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 060ecf1 commit bdd16a75e6ee5ec420bec1ca441e97b403dfb9d4 @dhh dhh committed May 22, 2005
Showing with 1 addition and 1 deletion.
  1. +1 −1 actionpack/lib/action_controller/layout.rb
View
2 actionpack/lib/action_controller/layout.rb
@@ -218,7 +218,7 @@ def render_with_a_layout(options = {}, deprecated_status = nil, deprecated_layou
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]

0 comments on commit bdd16a7

Please sign in to comment.