diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-10 16:15:43 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-10 16:15:43 -0800 |
| commit | 631a27d6a51b0f9b11c8cc2165cae70bcd8134dd (patch) | |
| tree | 9315d6c26d1867bf291cc8e07fc49a2d9237c43f /actionpack/lib/abstract_controller/layouts.rb | |
| parent | 8cd486da807d1b15b8ba4a049a79df6c47c56bd4 (diff) | |
| download | rails-631a27d6a51b0f9b11c8cc2165cae70bcd8134dd.tar.gz rails-631a27d6a51b0f9b11c8cc2165cae70bcd8134dd.tar.bz2 rails-631a27d6a51b0f9b11c8cc2165cae70bcd8134dd.zip | |
Revert "Revert "Eliminate warning with layout is unset""
This reverts commit d8fd0499bfd6edc676ff3fbffc327656f6d5c320.
Diffstat (limited to 'actionpack/lib/abstract_controller/layouts.rb')
| -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 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 |