未验证 提交 b05fc6e8 编写于 作者: R Rafael França 提交者: GitHub

Merge pull request #32612 from utilum/splat_actionview

Ruby 2.6 warning: passing splat keyword arguments as a single Hash
......@@ -71,11 +71,16 @@ def tree(name, finder, partial = false, seen = {})
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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册