1 files changed, 5 insertions, 6 deletions
diff --git a/actionview/lib/action_view/renderer/template_renderer.rb b/actionview/lib/action_view/renderer/template_renderer.rb
index be17097428..cd21d7ab47 100644
--- a/actionview/lib/action_view/renderer/template_renderer.rb
+++ b/actionview/lib/action_view/renderer/template_renderer.rb
@@ -6,20 +6,19 @@ module ActionView
       @view    = context
       @details = extract_details(options)
       template = determine_template(options)
-      context  = @lookup_context
 
       prepend_formats(template.formats)
 
-      unless context.rendered_format
-        context.rendered_format = template.formats.first || formats.first
-      end
+      @lookup_context.rendered_format ||= (template.formats.first || formats.first)
 
       render_template(template, options[:layout], options[:locals])
     end
 
+    private
+
     # Determine the template to be rendered using the given options.
-    def determine_template(options) #:nodoc:
-      keys = options.fetch(:locals, {}).keys
+    def determine_template(options)
+      keys = options.has_key?(:locals) ? options[:locals].keys : []
 
       if options.key?(:body)
         Template::Text.new(options[:body])