diff options
Diffstat (limited to 'actionmailer/lib/action_mailer/delivery_method')
| -rw-r--r-- | actionmailer/lib/action_mailer/delivery_method/file.rb | 2 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/delivery_method/smtp.rb | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/actionmailer/lib/action_mailer/delivery_method/file.rb b/actionmailer/lib/action_mailer/delivery_method/file.rb index 6c8cdf4450..571e32df49 100644 --- a/actionmailer/lib/action_mailer/delivery_method/file.rb +++ b/actionmailer/lib/action_mailer/delivery_method/file.rb @@ -12,7 +12,7 @@ module ActionMailer def perform_delivery(mail) FileUtils.mkdir_p settings[:location] - (mail.to + mail.cc + mail.bcc).uniq.each do |to| + mail.destinations.uniq.each do |to| ::File.open(::File.join(settings[:location], to), 'a') { |f| f.write(mail) } end end diff --git a/actionmailer/lib/action_mailer/delivery_method/smtp.rb b/actionmailer/lib/action_mailer/delivery_method/smtp.rb index f81d64af36..af30c498b5 100644 --- a/actionmailer/lib/action_mailer/delivery_method/smtp.rb +++ b/actionmailer/lib/action_mailer/delivery_method/smtp.rb @@ -16,8 +16,7 @@ module ActionMailer def perform_delivery(mail) destinations = mail.destinations - mail.ready_to_send - sender = (mail['return-path'] && mail['return-path'].spec) || Array(mail.from).first + sender = (mail['return-path'] && mail['return-path'].address) || mail['from'] smtp = Net::SMTP.new(settings[:address], settings[:port]) smtp.enable_starttls_auto if settings[:enable_starttls_auto] && smtp.respond_to?(:enable_starttls_auto) |