ddollar / rails fork watch download tarball
public
Fork of rails/rails
Description: Ruby on Rails
Homepage: http://rubyonrails.org
Clone URL: git://github.com/ddollar/rails.git
Search Repo: 
Avoid modifying the sendmail_settings hash when using the return path. 
Closes #7572 [billkirtley]


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9228 
5ecf4fe2-1ee6-0310-87b1-e25e094e27de
NZKoz (author)
Sat Apr 05 04:28:15 -0700 2008
commit  77730f7c9dc2e28e7f3c84ce647b84eb470dd819
tree    5acf80e4a228ebd2d3209bfe8221454f43348049
parent  097c0d61660aeee598900b1e748332f24eaec68e
0
actionmailer/lib/action_mailer/base.rb 
...
603
604
605
606
607
 
 
 
608
609
610
 
...
603
604
605
 
 
606
607
608
609
610
611
 
0
@@ -603,8 +603,9 @@
0
       end
0
 
0
       def perform_delivery_sendmail(mail)
0
-        sendmail_settings[:arguments] += " -f \"#{mail['return-path']}\"" if mail['return-path']
0
-        IO.popen("#{sendmail_settings[:location]} #{sendmail_settings[:arguments]}","w+") do |sm|
0
+        sendmail_args = sendmail_settings[:arguments]
0
+        sendmail_args += " -f \"#{mail['return-path']}\"" if mail['return-path']
0
+        IO.popen("#{sendmail_settings[:location]} #{sendmail_args}","w+") do |sm|
0
           sm.print(mail.encoded.gsub(/\r/, ''))
0
           sm.flush
0
         end

Comments

    No one has commented yet.