aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/abstract_controller/layouts.rb
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 14:13:21 -0800
commit90be80361f26d717f9842170315dd8659f35429d (patch)
tree3065ac2f438b00d47a519297125c655fe213c43d /actionpack/lib/abstract_controller/layouts.rb
parent3bdfda073098e37d852e58b6376fd3dcb5e00622 (diff)
downloadrails-90be80361f26d717f9842170315dd8659f35429d.tar.gz
rails-90be80361f26d717f9842170315dd8659f35429d.tar.bz2
rails-90be80361f26d717f9842170315dd8659f35429d.zip
Eliminate warning with layout is unset
Diffstat (limited to 'actionpack/lib/abstract_controller/layouts.rb')
-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..60bd486763 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 @_layout ||= nil
when String
self.class_eval %{def _layout(details) #{@_layout.inspect} end}
when Symbol