diff options
| author | Michael Koziarski <michael@koziarski.com> | 2009-11-28 13:34:05 +1300 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2009-11-28 13:34:05 +1300 |
| commit | 7e0aa35c20f06fd9ef245155e30e81cfb38bad05 (patch) | |
| tree | f35b95439cb1d4a9575de594505acfd023cfc06c /actionmailer/lib | |
| parent | 02c3c9dfbcec05e3b0cecc062da8acd0cf7c53e0 (diff) | |
| download | rails-7e0aa35c20f06fd9ef245155e30e81cfb38bad05.tar.gz rails-7e0aa35c20f06fd9ef245155e30e81cfb38bad05.tar.bz2 rails-7e0aa35c20f06fd9ef245155e30e81cfb38bad05.zip | |
avoid generating invalid SMTP commands in ruby pre 1.9
Signed-off-by: Michael Koziarski <michael@koziarski.com>
Conflicts:
actionmailer/lib/action_mailer/base.rb
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) |