diff options
| author | José Valim <jose.valim@gmail.com> | 2009-12-01 13:00:34 -0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-12-01 13:00:34 -0200 |
| commit | c2e97cb410d759f383d29920165abdbf4b70e019 (patch) | |
| tree | b375de84add24ee4c4551deec533b0667512bf34 /actionmailer/lib | |
| parent | fc3629f6ca2b43693f5447a1fb43881f1814e117 (diff) | |
| parent | 6ac32a83283f46b55675ddf4ecab6c91f6f8abde (diff) | |
| download | rails-c2e97cb410d759f383d29920165abdbf4b70e019.tar.gz rails-c2e97cb410d759f383d29920165abdbf4b70e019.tar.bz2 rails-c2e97cb410d759f383d29920165abdbf4b70e019.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionmailer/lib')
| -rw-r--r-- | actionmailer/lib/action_mailer/delivery_method/smtp.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/delivery_method/smtp.rb b/actionmailer/lib/action_mailer/delivery_method/smtp.rb index 86b0ae8329..95c117c9e0 100644 --- a/actionmailer/lib/action_mailer/delivery_method/smtp.rb +++ b/actionmailer/lib/action_mailer/delivery_method/smtp.rb @@ -16,7 +16,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'].spec) || Array(mail.from).first smtp = Net::SMTP.new(settings[:address], settings[:port]) smtp.enable_starttls_auto if settings[:enable_starttls_auto] && smtp.respond_to?(:enable_starttls_auto) |