Skip to content

Commit

Permalink
Shush uninitialized @_layout warning
Browse files Browse the repository at this point in the history
  • Loading branch information
jeremy committed Sep 28, 2012
1 parent ddba97f commit c203557
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion actionpack/lib/abstract_controller/layouts.rb
Expand Up @@ -309,7 +309,7 @@ def _write_layout_method
# still does a dynamic lookup. In next Rails release, we should @_layout
# to be inheritable so we can skip the child lookup if the parent explicitly
# set the layout.
parent = self.superclass.instance_variable_get(:@_layout)
parent = self.superclass.instance_eval { @_layout if defined?(@_layout) }
@_layout = nil
inspect = parent.is_a?(Proc) ? parent.inspect : parent

Expand Down

0 comments on commit c203557

Please sign in to comment.