1.9 compatibility - don't pass an array as the from address as this e…

…nds up generating invalid SMTP commands.
rails · Jun 9, 2009 · 1d57ccb · 1d57ccb · travissinnott · Aug 19, 2009
1 parent 74c1249
commit 1d57ccb
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
@@ -697,7 +697,7 @@ def create_mail
       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)