diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-10 16:09:52 -0800 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-10 16:09:52 -0800 |
commit | d8fd0499bfd6edc676ff3fbffc327656f6d5c320 (patch) | |
tree | 745402f7db912c598b561d046f9a08d90ccd5139 | |
parent | c626be796ce2fd716d72f8d38784eabe7267625e (diff) | |
download | rails-d8fd0499bfd6edc676ff3fbffc327656f6d5c320.tar.gz rails-d8fd0499bfd6edc676ff3fbffc327656f6d5c320.tar.bz2 rails-d8fd0499bfd6edc676ff3fbffc327656f6d5c320.zip |
Revert "Eliminate warning with layout is unset"
This reverts commit 1fcf32f8fef8fb5a63a66edacf556a107d12c049.
-rw-r--r-- | actionpack/lib/abstract_controller/layouts.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb index c71cef42b2..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 defined?(@_layout) ? @_layout : nil + case @_layout when String self.class_eval %{def _layout(details) #{@_layout.inspect} end} when Symbol |