diff options
| author | Emilio Tagua <miloops@gmail.com> | 2010-09-28 18:25:24 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2010-09-28 18:25:24 -0300 |
| commit | 0fa9c5392ec24a7d1017d03aa00a2bac32f53158 (patch) | |
| tree | 5b9f3da2d93486e8363425fff7cdfe42e3f20bdb /actionpack | |
| parent | 357f59447d79a09d7a84fa8c2bc7892b5fc02ca9 (diff) | |
| download | rails-0fa9c5392ec24a7d1017d03aa00a2bac32f53158.tar.gz rails-0fa9c5392ec24a7d1017d03aa00a2bac32f53158.tar.bz2 rails-0fa9c5392ec24a7d1017d03aa00a2bac32f53158.zip | |
Define @_layout if it is not defined.
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/abstract_controller/layouts.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb index 958e7f7ec8..bbc9739f14 100644 --- a/actionpack/lib/abstract_controller/layouts.rb +++ b/actionpack/lib/abstract_controller/layouts.rb @@ -345,6 +345,7 @@ module AbstractController # * <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, |