Skip to content
This repository
Browse code

Revert "Revert "Eliminate warning with layout is unset""

This reverts commit d8fd049.
  • Loading branch information...
commit 631a27d6a51b0f9b11c8cc2165cae70bcd8134dd 1 parent 8cd486d
Jeremy Kemper authored November 10, 2009
2  actionpack/lib/abstract_controller/layouts.rb
@@ -100,7 +100,7 @@ def _implied_layout_name
100 100
       # name, return that string. Otherwise, use the superclass'
101 101
       # layout (which might also be implied)
102 102
       def _write_layout_method
103  
-        case @_layout
  103
+        case defined?(@_layout) ? @_layout : nil
104 104
         when String
105 105
           self.class_eval %{def _layout(details) #{@_layout.inspect} end}
106 106
         when Symbol

0 notes on commit 631a27d

Please sign in to comment.
Something went wrong with that request. Please try again.