From 1d57ccbc6f80a506e5c3867976793310e9148f03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Friedrich=20G=C3=B6pel?= Date: Tue, 9 Jun 2009 20:22:20 +1200 Subject: 1.9 compatibility - don't pass an array as the from address as this ends up generating invalid SMTP commands. --- actionmailer/lib/action_mailer/base.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) -- cgit v1.2.3