diff options
author | Mikel Lindsaar <raasdnil@gmail.com> | 2009-11-12 16:08:50 +1100 |
---|---|---|
committer | Mikel Lindsaar <raasdnil@gmail.com> | 2009-11-12 16:08:50 +1100 |
commit | 15d7cac282e29f0a8e7b38dade07abb32d97a991 (patch) | |
tree | 573d27da4f642b2b16840fbc7621d85acd8634ea /actionmailer/lib/action_mailer/delivery_method/smtp.rb | |
parent | cbded53671bccccbaf7e9fdfa93ef86cb097daa3 (diff) | |
download | rails-15d7cac282e29f0a8e7b38dade07abb32d97a991.tar.gz rails-15d7cac282e29f0a8e7b38dade07abb32d97a991.tar.bz2 rails-15d7cac282e29f0a8e7b38dade07abb32d97a991.zip |
Starting again on actionmailer integration with mail
Diffstat (limited to 'actionmailer/lib/action_mailer/delivery_method/smtp.rb')
-rw-r--r-- | actionmailer/lib/action_mailer/delivery_method/smtp.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/delivery_method/smtp.rb b/actionmailer/lib/action_mailer/delivery_method/smtp.rb index 86b0ae8329..9622dbb93a 100644 --- a/actionmailer/lib/action_mailer/delivery_method/smtp.rb +++ b/actionmailer/lib/action_mailer/delivery_method/smtp.rb @@ -15,8 +15,7 @@ module ActionMailer def perform_delivery(mail) destinations = mail.destinations - mail.ready_to_send - sender = (mail['return-path'] && mail['return-path'].spec) || mail['from'] + 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) |