From 1ee4eebb2b2da07e49bb7d467f5f9d5497bcf718 Mon Sep 17 00:00:00 2001 From: Javan Makhmali Date: Wed, 15 Jun 2016 17:56:17 -0400 Subject: Fix finding templates for digesting for */* requests that render a non-default (html) template --- actionview/lib/action_view/digestor.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'actionview/lib') diff --git a/actionview/lib/action_view/digestor.rb b/actionview/lib/action_view/digestor.rb index 8d174955a1..f3c29d663c 100644 --- a/actionview/lib/action_view/digestor.rb +++ b/actionview/lib/action_view/digestor.rb @@ -38,10 +38,13 @@ module ActionView # Create a dependency tree for template named +name+. def tree(name, finder, partial = false, seen = {}) logical_name = name.gsub(%r|/_|, "/") - formats = [finder.rendered_format] - if finder.disable_cache { finder.exists?(logical_name, [], partial, [], formats: formats) } - template = finder.disable_cache { finder.find(logical_name, [], partial, [], formats: formats) } + options = {} + options[:formats] = [finder.rendered_format] if finder.rendered_format + + if finder.disable_cache { finder.exists?(logical_name, [], partial, [], options) } + template = finder.disable_cache { finder.find(logical_name, [], partial, [], options) } + finder.rendered_format ||= template.formats.first if node = seen[template.identifier] # handle cycles in the tree node -- cgit v1.2.3