aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-03-08 20:57:33 +0100
committerJosé Valim <jose.valim@gmail.com>2010-03-08 20:57:33 +0100
commit36eb1a686c831d5a14998bb9ac7cc60efa363373 (patch)
treecdaa517ecfa17da37f9d5502a30ff9e73169ca47 /actionmailer/lib
parentbdf5096816d03f2bdaefd20a07a0fa562543549c (diff)
downloadrails-36eb1a686c831d5a14998bb9ac7cc60efa363373.tar.gz
rails-36eb1a686c831d5a14998bb9ac7cc60efa363373.tar.bz2
rails-36eb1a686c831d5a14998bb9ac7cc60efa363373.zip
Bring AM up to date with new rendering stack.
Diffstat (limited to 'actionmailer/lib')
-rw-r--r--actionmailer/lib/action_mailer/base.rb12
-rw-r--r--actionmailer/lib/action_mailer/old_api.rb2
2 files changed, 6 insertions, 8 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 6937d76b5d..bc708cca56 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -614,14 +614,12 @@ module ActionMailer #:nodoc:
def each_template(paths, name, &block) #:nodoc:
Array(paths).each do |path|
- self.class.view_paths.each do |load_paths|
- templates = load_paths.find_all(name, {}, path)
- templates = templates.uniq_by { |t| t.details[:formats] }
+ templates = lookup_context.find_all(name, path)
- unless templates.empty?
- templates.each(&block)
- return
- end
+ unless templates.empty?
+ templates = templates.uniq_by { |t| t.details[:formats] }
+ templates.each(&block)
+ return
end
end
end
diff --git a/actionmailer/lib/action_mailer/old_api.rb b/actionmailer/lib/action_mailer/old_api.rb
index 941261a5b4..aeb653c5db 100644
--- a/actionmailer/lib/action_mailer/old_api.rb
+++ b/actionmailer/lib/action_mailer/old_api.rb
@@ -206,7 +206,7 @@ module ActionMailer
if String === @body
@parts.unshift create_inline_part(@body)
elsif @parts.empty? || @parts.all? { |p| p.content_disposition =~ /^attachment/ }
- self.class.view_paths.first.find_all(@template, {}, @mailer_name).each do |template|
+ lookup_context.find_all(@template, @mailer_name).each do |template|
@parts << create_inline_part(render(:_template => template), template.mime_type)
end