diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-02-29 12:03:15 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-02-29 12:03:15 -0800 |
| commit | f9995ce0e03444e31d710a06e054365e33fee0d2 (patch) | |
| tree | daa30dacb75d70d7b476706328566dc18ce713e6 /actionpack/lib | |
| parent | 1d215286c9019a0fa98e87bffccc8fc2b97d5a46 (diff) | |
| parent | b27c29ef4a26755b8de04686241694ce5ee33724 (diff) | |
| download | rails-f9995ce0e03444e31d710a06e054365e33fee0d2.tar.gz rails-f9995ce0e03444e31d710a06e054365e33fee0d2.tar.bz2 rails-f9995ce0e03444e31d710a06e054365e33fee0d2.zip | |
Merge pull request #5203 from avakhov/anonymous-controller-layout
Fix layout lookup for anonymous controller
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/abstract_controller/layouts.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb index aa39e21ba9..92e93cbee7 100644 --- a/actionpack/lib/abstract_controller/layouts.rb +++ b/actionpack/lib/abstract_controller/layouts.rb @@ -280,6 +280,10 @@ module AbstractController <<-RUBY lookup_context.find_all("#{_implied_layout_name}", #{prefixes.inspect}).first || super RUBY + else + <<-RUBY + super + RUBY end layout_definition = case _layout |