diff options
| author | José Valim <jose.valim@gmail.com> | 2011-12-20 14:56:18 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-12-20 14:56:18 +0100 |
| commit | f29b4a02fddb71d15fe1ee5f58096699caf61916 (patch) | |
| tree | 59127f772198fc0964ff3d165fc7ef045405a029 /actionpack/lib | |
| parent | e97aa2c22c189864621bf28d4a5da27a3c0287a4 (diff) | |
| download | rails-f29b4a02fddb71d15fe1ee5f58096699caf61916.tar.gz rails-f29b4a02fddb71d15fe1ee5f58096699caf61916.tar.bz2 rails-f29b4a02fddb71d15fe1ee5f58096699caf61916.zip | |
Add a test case for layout nil.
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/abstract_controller/layouts.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb index 8b6136d6ba..cb3b793418 100644 --- a/actionpack/lib/abstract_controller/layouts.rb +++ b/actionpack/lib/abstract_controller/layouts.rb @@ -241,6 +241,7 @@ module AbstractController # the template name # false:: There is no layout # true:: raise an ArgumentError + # nil:: Force default layout behavior with inheritance # # ==== Parameters # * <tt>layout</tt> - The layout to use. @@ -254,7 +255,7 @@ module AbstractController conditions.each {|k, v| conditions[k] = Array(v).map {|a| a.to_s} } self._layout_conditions = conditions - @_layout = layout || false # Converts nil to false + @_layout = layout _write_layout_method end |