Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 9228

Show
Ignore:
Timestamp:
04/05/08 11:28:15 (6 months ago)
Author:
nzkoz
Message:

Avoid modifying the sendmail_settings hash when using the return path. Closes #7572 [billkirtley]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/actionmailer/lib/action_mailer/base.rb

    r9164 r9228  
    604604 
    605605      def perform_delivery_sendmail(mail) 
    606         sendmail_settings[:arguments] += " -f \"#{mail['return-path']}\"" if mail['return-path'] 
    607         IO.popen("#{sendmail_settings[:location]} #{sendmail_settings[:arguments]}","w+") do |sm| 
     606        sendmail_args = sendmail_settings[:arguments] 
     607        sendmail_args += " -f \"#{mail['return-path']}\"" if mail['return-path'] 
     608        IO.popen("#{sendmail_settings[:location]} #{sendmail_args}","w+") do |sm| 
    608609          sm.print(mail.encoded.gsub(/\r/, '')) 
    609610          sm.flush