aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-11-10 15:43:37 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2009-11-10 15:43:37 -0800
commit6480850d3787a2e56bf7ef01e2b6d823f488972e (patch)
tree021512f32617babc24ef9a7f9cd179e81778997b /actionpack
parente889f315c8af6d67bf605069a0ffb8848aea145d (diff)
downloadrails-6480850d3787a2e56bf7ef01e2b6d823f488972e.tar.gz
rails-6480850d3787a2e56bf7ef01e2b6d823f488972e.tar.bz2
rails-6480850d3787a2e56bf7ef01e2b6d823f488972e.zip
Revert "Eliminate warning with layout is unset"
This reverts commit 90be80361f26d717f9842170315dd8659f35429d.
Diffstat (limited to 'actionpack')
-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 60bd486763..1616f8030a 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 ||= nil
+ case @_layout
when String
self.class_eval %{def _layout(details) #{@_layout.inspect} end}
when Symbol