diff options
| author | Friedrich Göpel <friedrich.goepel@gmail.com> | 2009-06-09 20:22:20 +1200 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2009-06-09 20:22:20 +1200 |
| commit | 1d57ccbc6f80a506e5c3867976793310e9148f03 (patch) | |
| tree | 729c40dc04fa842af91f9c68c0aa301f3fe0260d | |
| parent | 74c1249d0727e6375529e4bb5b2e2ac78f4a91dc (diff) | |
| download | rails-1d57ccbc6f80a506e5c3867976793310e9148f03.tar.gz rails-1d57ccbc6f80a506e5c3867976793310e9148f03.tar.bz2 rails-1d57ccbc6f80a506e5c3867976793310e9148f03.zip | |
1.9 compatibility - don't pass an array as the from address as this ends up generating invalid SMTP commands.
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index af2cc2ee24..0ddb3f0621 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -697,7 +697,7 @@ module ActionMailer #:nodoc: def perform_delivery_smtp(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) || mail['from'] smtp = Net::SMTP.new(smtp_settings[:address], smtp_settings[:port]) smtp.enable_starttls_auto if smtp_settings[:enable_starttls_auto] && smtp.respond_to?(:enable_starttls_auto) |