diff options
| author | Matthew Landauer <matthew@openaustralia.org> | 2013-01-25 14:43:40 +1100 |
|---|---|---|
| committer | Matthew Landauer <matthew@openaustralia.org> | 2013-01-25 14:43:40 +1100 |
| commit | 65680320bee44812394041492c8492e95b1a3d78 (patch) | |
| tree | 292dff9f7f11f225baba1b2f5f30f7b5a941cadc /lib | |
| parent | 1ed216502e3b2ef22a1765f985aebf0c5920153e (diff) | |
In rails 3 sendmail is passed the destination of the email on the commandline. Also, monkeypatch not needed anymore
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sendmail_return_path.rb | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/lib/sendmail_return_path.rb b/lib/sendmail_return_path.rb deleted file mode 100644 index 23c4d4376..000000000 --- a/lib/sendmail_return_path.rb +++ /dev/null @@ -1,21 +0,0 @@ -# Monkeypatch! -# Grrr, semantics of smtp and sendmail send should be the same with regard to setting return path - -# See test in spec/lib/sendmail_return_path_spec.rb - -module ActionMailer - class Base - def perform_delivery_sendmail(mail) - sender = (mail['return-path'] && mail['return-path'].spec) || mail.from.first - - 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 - end - end - end -end - |