fix rendering a partial with an array as its :object [#5746 state:resolved]

Signed-off-by: Michael Koziarski <michael@koziarski.com>

Conflicts:

	actionpack/lib/action_view/render/partials.rb

1 files changed, 7 insertions, 3 deletions

diff --git a/actionpack/lib/action_view/render/partials.rb b/actionpack/lib/action_view/render/partials.rb
index 24d9e9ffb5..4e03d43358 100644
--- a/actionpack/lib/action_view/render/partials.rb
+++ b/actionpack/lib/action_view/render/partials.rb
@@ -235,7 +235,7 @@ module ActionView
         else
           @object = partial
 
-          if @collection = collection
+          if @collection = collection_from_object || collection
             paths = @collection_data = @collection.map { |o| partial_path(o) }
             @path = paths.uniq.size == 1 ? paths.first : nil
           else
@@ -337,10 +337,14 @@ module ActionView
     private
 
       def collection
+        if @options.key?(:collection)
+          @options[:collection] || []
+        end
+      end
+
+      def collection_from_object
         if @object.respond_to?(:to_ary)
           @object
-        elsif @options.key?(:collection)
-          @options[:collection] || []
         end
       end