提交 744307e5 编写于 作者: C Carlos Antonio da Silva

Send paths argument as an array rather than converting it internally

上级 2cb576ef
...@@ -748,7 +748,7 @@ def collect_responses(headers) #:nodoc: ...@@ -748,7 +748,7 @@ def collect_responses(headers) #:nodoc:
templates_path = headers.delete(:template_path) || self.class.mailer_name templates_path = headers.delete(:template_path) || self.class.mailer_name
templates_name = headers.delete(:template_name) || action_name templates_name = headers.delete(:template_name) || action_name
each_template(templates_path, templates_name) do |template| each_template(Array(templates_path), templates_name) do |template|
self.formats = template.formats self.formats = template.formats
responses << { responses << {
...@@ -762,9 +762,9 @@ def collect_responses(headers) #:nodoc: ...@@ -762,9 +762,9 @@ def collect_responses(headers) #:nodoc:
end end
def each_template(paths, name, &block) #:nodoc: def each_template(paths, name, &block) #:nodoc:
templates = lookup_context.find_all(name, Array(paths)) templates = lookup_context.find_all(name, paths)
if templates.empty? if templates.empty?
raise ActionView::MissingTemplate.new([paths], name, [paths], false, 'mailer') raise ActionView::MissingTemplate.new(paths, name, paths, false, 'mailer')
else else
templates.uniq { |t| t.formats }.each(&block) templates.uniq { |t| t.formats }.each(&block)
end end
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册