1 files changed, 12 insertions, 11 deletions
diff --git a/actionview/lib/action_view/renderer/template_renderer.rb b/actionview/lib/action_view/renderer/template_renderer.rb
index f3a48ecfa0..75217e1630 100644
--- a/actionview/lib/action_view/renderer/template_renderer.rb
+++ b/actionview/lib/action_view/renderer/template_renderer.rb
@@ -18,7 +18,7 @@ module ActionView
 
     # Determine the template to be rendered using the given options.
     def determine_template(options)
-      keys = options.fetch(:locals, {}).keys
+      keys = options.has_key?(:locals) ? options[:locals].keys : []
 
       if options.key?(:body)
         Template::Text.new(options[:body])
@@ -40,7 +40,7 @@ module ActionView
           find_template(options[:template], options[:prefixes], false, keys, @details)
         end
       else
-        raise ArgumentError, "You invoked render but did not give any of :partial, :template, :inline, :file, :plain, :text or :body option."
+        raise ArgumentError, "You invoked render but did not give any of :partial, :template, :inline, :file, :plain, :html, :text or :body option."
       end
     end
 
@@ -57,7 +57,7 @@ module ActionView
     end
 
     def render_with_layout(path, locals) #:nodoc:
-      layout  = path && find_layout(path, locals.keys)
+      layout  = path && find_layout(path, locals.keys, [formats.first])
       content = yield(layout)
 
       if layout
@@ -72,27 +72,28 @@ module ActionView
     # This is the method which actually finds the layout using details in the lookup
     # context object. If no layout is found, it checks if at least a layout with
     # the given name exists across all details before raising the error.
-    def find_layout(layout, keys)
-      with_layout_format { resolve_layout(layout, keys) }
+    def find_layout(layout, keys, formats)
+      resolve_layout(layout, keys, formats)
     end
 
-    def resolve_layout(layout, keys)
+    def resolve_layout(layout, keys, formats)
+      details = @details.dup
+      details[:formats] = formats
+
       case layout
       when String
         begin
           if layout =~ /^\//
-            with_fallbacks { find_template(layout, nil, false, keys, @details) }
+            with_fallbacks { find_template(layout, nil, false, keys, details) }
           else
-            find_template(layout, nil, false, keys, @details)
+            find_template(layout, nil, false, keys, details)
           end
         rescue ActionView::MissingTemplate
           all_details = @details.merge(:formats => @lookup_context.default_formats)
           raise unless template_exists?(layout, nil, false, keys, all_details)
         end
       when Proc
-        resolve_layout(layout.call, keys)
-      when FalseClass
-        nil
+        resolve_layout(layout.call(formats), keys, formats)
       else
         layout
       end