From d4d99bbc87021fad1df516cb24912973d186279d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 8 Dec 2011 22:56:50 +0100
Subject: Fix another regression related to the layout optimization.

---
 actionpack/lib/action_view/renderer/template_renderer.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'actionpack/lib')

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
-- 
cgit v1.2.3