diff options
author | Santiago Pastorino <santiago@wyeworks.com> | 2016-07-26 14:14:41 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-26 14:14:41 -0300 |
commit | 49315e278944b65f2ffd1c95caf342b17a692327 (patch) | |
tree | 1567f23bc5fea4fe6c483d768661f6d86566d3c8 /actionview/lib/action_view/renderer/partial_renderer.rb | |
parent | c4b33a779680ee8f38d510789dfe1b3749a47734 (diff) | |
parent | 87899cfcf0ada140764acf4393eb862698449f54 (diff) | |
download | rails-49315e278944b65f2ffd1c95caf342b17a692327.tar.gz rails-49315e278944b65f2ffd1c95caf342b17a692327.tar.bz2 rails-49315e278944b65f2ffd1c95caf342b17a692327.zip |
Merge pull request #25912 from stevenharman/fix_render_partial_collection_to_allow_custom_collection
Changed partial rendering to allow collections which don't implement `#to_ary`.
Diffstat (limited to 'actionview/lib/action_view/renderer/partial_renderer.rb')
-rw-r--r-- | actionview/lib/action_view/renderer/partial_renderer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionview/lib/action_view/renderer/partial_renderer.rb b/actionview/lib/action_view/renderer/partial_renderer.rb index c2b15e72e9..7c2e07185c 100644 --- a/actionview/lib/action_view/renderer/partial_renderer.rb +++ b/actionview/lib/action_view/renderer/partial_renderer.rb @@ -404,7 +404,7 @@ module ActionView def collection_from_options if @options.key?(:collection) collection = @options[:collection] - collection.respond_to?(:to_ary) ? collection.to_ary : [] + collection ? collection.to_a : [] end end |