Merge pull request #32612 from utilum/splat_actionview

Ruby 2.6 warning: passing splat keyword arguments as a single Hash
This commit is contained in:
Rafael França 2018-04-17 16:53:05 -04:00 committed by GitHub
commit b05fc6e810
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions

View File

@ -71,11 +71,16 @@ module ActionView
private
def find_template(finder, *args)
name = args.first
prefixes = args[1] || []
partial = args[2] || false
keys = args[3] || []
options = args[4] || {}
finder.disable_cache do
if format = finder.rendered_format
finder.find_all(*args, formats: [format]).first || finder.find_all(*args).first
finder.find_all(name, prefixes, partial, keys, options.merge(formats: [format])).first || finder.find_all(name, prefixes, partial, keys, options).first
else
finder.find_all(*args).first
finder.find_all(name, prefixes, partial, keys, options).first
end
end
end