From bdd16a75e6ee5ec420bec1ca441e97b403dfb9d4 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 22 May 2005 16:57:51 +0000 Subject: render :nothing shouldnt cause layouts git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1353 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/layout.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack/lib/action_controller/layout.rb') diff --git a/actionpack/lib/action_controller/layout.rb b/actionpack/lib/action_controller/layout.rb index 104079efe1..e7e8d3b834 100644 --- a/actionpack/lib/action_controller/layout.rb +++ b/actionpack/lib/action_controller/layout.rb @@ -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] -- cgit v1.2.3