Define @_layout if it is not defined.

2010-09-28 18:25:24 -03:00 · 2010-09-28 18:25:24 -03:00 · 0fa9c5392e
commit 0fa9c5392e
parent 357f59447d
1 changed files with 1 additions and 0 deletions
--- a/actionpack/lib/abstract_controller/layouts.rb
+++ b/actionpack/lib/abstract_controller/layouts.rb
@ -345,6 +345,7 @@ def _layout_for_option(name)
    # * <tt>template</tt> - The template object for the default layout (or nil)
    def _default_layout(require_layout = false)
      begin
+        @_layout ||= nil
        layout_name = _layout if action_has_layout?
      rescue NameError => e
        raise NoMethodError,