diff options
| author | John Hawthorn <john@hawthorn.email> | 2019-02-25 22:56:13 -0800 |
|---|---|---|
| committer | John Hawthorn <john@hawthorn.email> | 2019-02-26 16:59:04 -0800 |
| commit | bcd42ae974eb04cb5def7a01d194e70b87bc4152 (patch) | |
| tree | b5137a5db13808ce84bed7ed121cbe21a4c57ea5 /actionview/lib/action_view/template/resolver.rb | |
| parent | c2145462178d2b28135fac38ebbceeaadfa151df (diff) | |
| download | rails-bcd42ae974eb04cb5def7a01d194e70b87bc4152.tar.gz rails-bcd42ae974eb04cb5def7a01d194e70b87bc4152.tar.bz2 rails-bcd42ae974eb04cb5def7a01d194e70b87bc4152.zip | |
Remove query_format argument from resolver
Diffstat (limited to 'actionview/lib/action_view/template/resolver.rb')
| -rw-r--r-- | actionview/lib/action_view/template/resolver.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionview/lib/action_view/template/resolver.rb b/actionview/lib/action_view/template/resolver.rb index f2b8b1166d..1dc9c9919a 100644 --- a/actionview/lib/action_view/template/resolver.rb +++ b/actionview/lib/action_view/template/resolver.rb @@ -212,7 +212,7 @@ module ActionView template_paths = reject_files_external_to_app(template_paths) unless outside_app_allowed template_paths.map do |template| - handler, format, variant = extract_handler_and_format_and_variant(template, formats.first) + handler, format, variant = extract_handler_and_format_and_variant(template) FileTemplate.new(File.expand_path(template), handler, virtual_path: path.virtual, @@ -280,7 +280,7 @@ module ActionView # Extract handler, formats and variant from path. If a format cannot be found neither # from the path, or the handler, we should return the array of formats given # to the resolver. - def extract_handler_and_format_and_variant(path, query_format) + def extract_handler_and_format_and_variant(path) pieces = File.basename(path).split(".") pieces.shift |