aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/abstract_controller
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-11-10 14:13:21 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2009-11-10 15:48:03 -0800
commit1fcf32f8fef8fb5a63a66edacf556a107d12c049 (patch)
tree0c05548e32fce1a5551a785dc726e6ec2ac232dd /actionpack/lib/abstract_controller
parentf14eb686ef36babfbfc0eb9ef9de962f365c7277 (diff)
downloadrails-1fcf32f8fef8fb5a63a66edacf556a107d12c049.tar.gz
rails-1fcf32f8fef8fb5a63a66edacf556a107d12c049.tar.bz2
rails-1fcf32f8fef8fb5a63a66edacf556a107d12c049.zip
Eliminate warning with layout is unset
Diffstat (limited to 'actionpack/lib/abstract_controller')
-rw-r--r--actionpack/lib/abstract_controller/layouts.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb
index 1616f8030a..c71cef42b2 100644
--- a/actionpack/lib/abstract_controller/layouts.rb
+++ b/actionpack/lib/abstract_controller/layouts.rb
@@ -100,7 +100,7 @@ module AbstractController
# name, return that string. Otherwise, use the superclass'
# layout (which might also be implied)
def _write_layout_method
- case @_layout
+ case defined?(@_layout) ? @_layout : nil
when String
self.class_eval %{def _layout(details) #{@_layout.inspect} end}
when Symbol