Permalink
Browse files

Revert "Eliminate warning with layout is unset"

This reverts commit 90be803.
  • Loading branch information...
jeremy committed Nov 10, 2009
1 parent e889f31 commit 6480850d3787a2e56bf7ef01e2b6d823f488972e
Showing with 1 addition and 1 deletion.
  1. +1 −1 actionpack/lib/abstract_controller/layouts.rb
@@ -100,7 +100,7 @@ def _implied_layout_name
# 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

0 comments on commit 6480850

Please sign in to comment.