diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2012-09-28 10:53:17 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2012-09-28 10:53:17 -0700 |
| commit | c203557421b45e4c78de9d551e96e042b1553833 (patch) | |
| tree | 7dce7ac61b8b56d37eda3da2b06c03a805b4a5d5 /actionpack/lib | |
| parent | ddba97fa4f10319154e77d8f5e2c3e803f08e852 (diff) | |
| download | rails-c203557421b45e4c78de9d551e96e042b1553833.tar.gz rails-c203557421b45e4c78de9d551e96e042b1553833.tar.bz2 rails-c203557421b45e4c78de9d551e96e042b1553833.zip | |
Shush uninitialized @_layout warning
Diffstat (limited to 'actionpack/lib')
| -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 c482062592..3b07e4cdba 100644 --- a/actionpack/lib/abstract_controller/layouts.rb +++ b/actionpack/lib/abstract_controller/layouts.rb @@ -309,7 +309,7 @@ module AbstractController # 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 |