diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-05-22 16:57:51 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-05-22 16:57:51 +0000 |
| commit | bdd16a75e6ee5ec420bec1ca441e97b403dfb9d4 (patch) | |
| tree | 70df89ec70827da9e9ca2af729bddbd3410a929f /actionpack/lib/action_controller/layout.rb | |
| parent | 060ecf1a2463035b02a8a5a4dba62ee60ee16b8c (diff) | |
| download | rails-bdd16a75e6ee5ec420bec1ca441e97b403dfb9d4.tar.gz rails-bdd16a75e6ee5ec420bec1ca441e97b403dfb9d4.tar.bz2 rails-bdd16a75e6ee5ec420bec1ca441e97b403dfb9d4.zip | |
render :nothing shouldnt cause layouts
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1353 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/layout.rb')
| -rw-r--r-- | actionpack/lib/action_controller/layout.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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] |