diff options
| -rw-r--r-- | vendor/rails-2.1.0/actionmailer/lib/action_mailer/base.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/vendor/rails-2.1.0/actionmailer/lib/action_mailer/base.rb b/vendor/rails-2.1.0/actionmailer/lib/action_mailer/base.rb index e06513210..6340e8ac1 100644 --- a/vendor/rails-2.1.0/actionmailer/lib/action_mailer/base.rb +++ b/vendor/rails-2.1.0/actionmailer/lib/action_mailer/base.rb @@ -631,8 +631,10 @@ module ActionMailer #:nodoc: end def perform_delivery_sendmail(mail) - sendmail_args = sendmail_settings[:arguments] - sendmail_args += " -f \"#{mail['return-path']}\"" if mail['return-path'] + sender = mail['return-path'] || mail.from + + sendmail_args = sendmail_settings[:arguments].dup + sendmail_args += " -f \"#{sender}\"" IO.popen("#{sendmail_settings[:location]} #{sendmail_args}","w+") do |sm| sm.print(mail.encoded.gsub(/\r/, '')) sm.flush |