Merge branch 'master' of git://github.com/rails/rails into old

1 files changed, 4 insertions, 0 deletions

diff --git a/actionpack/lib/action_view/render/partials.rb b/actionpack/lib/action_view/render/partials.rb
index b7b14e9007..48cba9c02b 100644
--- a/actionpack/lib/action_view/render/partials.rb
+++ b/actionpack/lib/action_view/render/partials.rb
@@ -185,6 +185,8 @@ module ActionView
 
     def render_partial(options)
       @assigns_added = false
+      # TODO: Handle other details here.
+      self.formats = options[:_details][:formats]
       _render_partial(options)
     end
 
@@ -235,6 +237,8 @@ module ActionView
       end
 
       def _render_partial_collection(collection, options = {}, template = nil, &block) #:nodoc:
+        options[:_template] ||= template
+
         return nil if collection.blank?
 
         if options.key?(:spacer_template)