Fix another regression related to the layout optimization.

2 files changed, 27 insertions, 1 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
diff --git a/actionpack/test/controller/new_base/render_layout_test.rb b/actionpack/test/controller/new_base/render_layout_test.rb
index 73c2d8244a..4ac40ca405 100644
--- a/actionpack/test/controller/new_base/render_layout_test.rb
+++ b/actionpack/test/controller/new_base/render_layout_test.rb
@@ -82,7 +82,7 @@ module ControllerLayouts
 
   class MismatchFormatTest < Rack::TestCase
     testing ControllerLayouts::MismatchFormatController
-    
+
     XML_INSTRUCT = %Q(<?xml version="1.0" encoding="UTF-8"?>\n)
 
     test "if XML is selected, an HTML template is not also selected" do
@@ -100,4 +100,28 @@ module ControllerLayouts
       assert_response "alert('foo');"
     end
   end
+
+  class FalseLayoutMethodController < ::ApplicationController
+    self.view_paths = [ActionView::FixtureResolver.new(
+      "controller_layouts/false_layout_method/index.js.erb" => "alert('foo');"
+    )]
+
+    layout :which_layout?
+
+    def which_layout?
+      false
+    end
+
+    def index
+    end
+  end
+
+  class FalseLayoutMethodTest < Rack::TestCase
+    testing ControllerLayouts::FalseLayoutMethodController
+
+    test "access false layout returned by a method/proc" do
+      get :index, :format => "js"
+      assert_response "alert('foo');"
+    end
+  end
 end