|
From: Ulf E. <ulf...@us...> - 2005-09-08 20:05:50
|
Update of /cvsroot/phpbt/phpbt/inc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28332/inc Modified Files: functions.php Log Message: Reverting the SMTP_SENDER patch since this already exists in htmlMimeMail as return_path (which also works with 'mail') Index: functions.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/inc/functions.php,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- functions.php 29 Aug 2005 19:14:13 -0000 1.64 +++ functions.php 8 Sep 2005 20:05:42 -0000 1.65 @@ -601,6 +601,7 @@ $mail = new htmlMimeMail(); $mail->setSubject($subject); $mail->setFrom($from); + $mail->setReturnPath(RETURN_PATH); $recipient[] = $to; if (SEND_MIME_EMAIL) { @@ -620,7 +621,7 @@ } if (SMTP_EMAIL) { - $mail->setSMTPParams(SMTP_HOST, SMTP_PORT, SMTP_HELO, SMTP_AUTH, SMTP_AUTH_USER, SMTP_AUTH_PASS, SMTP_SENDER); + $mail->setSMTPParams(SMTP_HOST, SMTP_PORT, SMTP_HELO, SMTP_AUTH, SMTP_AUTH_USER, SMTP_AUTH_PASS); } $retval = $mail->send($recipient, SMTP_EMAIL ? 'smtp' : 'mail'); |