aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/lib/action_view/renderer/partial_renderer.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2019-02-22 11:58:04 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2019-02-22 11:58:04 -0800
commit62cb3ee35c5c0d729c54b057c37b8f6bed4dda7f (patch)
treebf6227cab8ce3e46aad24bb383eb37044625a0b2 /actionview/lib/action_view/renderer/partial_renderer.rb
parent3b6602aa7a01fb415fce07ef32458b131e5762e1 (diff)
downloadrails-62cb3ee35c5c0d729c54b057c37b8f6bed4dda7f.tar.gz
rails-62cb3ee35c5c0d729c54b057c37b8f6bed4dda7f.tar.bz2
rails-62cb3ee35c5c0d729c54b057c37b8f6bed4dda7f.zip
Ensure that rendered templates always have a format
This removes one call to `lookup_context` and also eliminates a conditional in `_render_template`.
Diffstat (limited to 'actionview/lib/action_view/renderer/partial_renderer.rb')
-rw-r--r--actionview/lib/action_view/renderer/partial_renderer.rb2
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 4ae6f635ae..ed8d5cf54e 100644
--- a/actionview/lib/action_view/renderer/partial_renderer.rb
+++ b/actionview/lib/action_view/renderer/partial_renderer.rb
@@ -326,7 +326,7 @@ module ActionView
def render_collection(view, template)
identifier = (template && template.identifier) || @path
instrument(:collection, identifier: identifier, count: @collection.size) do |payload|
- return RenderedCollection::EMPTY if @collection.blank?
+ return RenderedCollection.empty(@lookup_context.formats.first) if @collection.blank?
spacer = if @options.key?(:spacer_template)
spacer_template = find_template(@options[:spacer_template], @locals.keys)