diff options
| author | Javan Makhmali <javan@javan.us> | 2018-03-18 09:59:47 -0400 |
|---|---|---|
| committer | Javan Makhmali <javan@javan.us> | 2018-03-20 06:33:20 -0400 |
| commit | f4eb2e23a8f61e2766fb32a134bfa6d6b3b7f512 (patch) | |
| tree | 6530dc71dbb67bbad5dc799f0a698c5573f2724b /actionview/lib/action_view | |
| parent | 9d9f752661c31b3063d55bec14e797c957d2bb7d (diff) | |
| download | rails-f4eb2e23a8f61e2766fb32a134bfa6d6b3b7f512.tar.gz rails-f4eb2e23a8f61e2766fb32a134bfa6d6b3b7f512.tar.bz2 rails-f4eb2e23a8f61e2766fb32a134bfa6d6b3b7f512.zip | |
Fix digesting templates with mixed formats
Diffstat (limited to 'actionview/lib/action_view')
| -rw-r--r-- | actionview/lib/action_view/digestor.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/actionview/lib/action_view/digestor.rb b/actionview/lib/action_view/digestor.rb index 1cf0bd3016..dbd7a4ee11 100644 --- a/actionview/lib/action_view/digestor.rb +++ b/actionview/lib/action_view/digestor.rb @@ -45,11 +45,9 @@ module ActionView # Create a dependency tree for template named +name+. def tree(name, finder, partial = false, seen = {}) logical_name = name.gsub(%r|/_|, "/") + finder.formats = [finder.rendered_format] if finder.rendered_format - options = {} - options[:formats] = [finder.rendered_format] if finder.rendered_format - - if template = finder.disable_cache { finder.find_all(logical_name, [], partial, [], options).first } + if template = finder.disable_cache { finder.find_all(logical_name, [], partial, []).first } finder.rendered_format ||= template.formats.first if node = seen[template.identifier] # handle cycles in the tree |