diff options
| author | José Valim <jose.valim@gmail.com> | 2011-12-08 22:56:50 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-12-08 22:56:50 +0100 |
| commit | d4d99bbc87021fad1df516cb24912973d186279d (patch) | |
| tree | 0967350a546cdb86d7cc2850c731490afa150e75 /actionpack/lib | |
| parent | c41f08cefe6fa3747ee79001d9c88dc988e8064d (diff) | |
| download | rails-d4d99bbc87021fad1df516cb24912973d186279d.tar.gz rails-d4d99bbc87021fad1df516cb24912973d186279d.tar.bz2 rails-d4d99bbc87021fad1df516cb24912973d186279d.zip | |
Fix another regression related to the layout optimization.
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_view/renderer/template_renderer.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_view/renderer/template_renderer.rb b/actionpack/lib/action_view/renderer/template_renderer.rb index 1771fb0063..e131afa279 100644 --- a/actionpack/lib/action_view/renderer/template_renderer.rb +++ b/actionpack/lib/action_view/renderer/template_renderer.rb @@ -76,6 +76,8 @@ module ActionView end when Proc resolve_layout(layout.call, keys) + when FalseClass + nil else layout end |