32 lines
1.3 KiB
Plaintext
32 lines
1.3 KiB
Plaintext
$OpenBSD: patch-library_phpmailer_class_phpmailer_php,v 1.1 2012/06/13 00:41:39 sthen Exp $
|
|
--- library/phpmailer/class.phpmailer.php.orig Sat Jun 9 09:26:30 2012
|
|
+++ library/phpmailer/class.phpmailer.php Sat Jun 9 09:26:35 2012
|
|
@@ -597,9 +597,9 @@ class PHPMailer {
|
|
*/
|
|
protected function SendmailSend($header, $body) {
|
|
if ($this->Sender != '') {
|
|
- $sendmail = sprintf("%s -oi -f %s -t", escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender));
|
|
+ $sendmail = sprintf("%s -f %s -t", escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender));
|
|
} else {
|
|
- $sendmail = sprintf("%s -oi -t", escapeshellcmd($this->Sendmail));
|
|
+ $sendmail = sprintf("%s -t", escapeshellcmd($this->Sendmail));
|
|
}
|
|
if ($this->SingleTo === true) {
|
|
foreach ($this->SingleToArray as $key => $val) {
|
|
@@ -648,7 +648,7 @@ class PHPMailer {
|
|
}
|
|
$to = implode(', ', $toArr);
|
|
|
|
- $params = sprintf("-oi -f %s", $this->Sender);
|
|
+ $params = sprintf("-f %s", $this->Sender);
|
|
if ($this->Sender != '' && strlen(ini_get('safe_mode'))< 1) {
|
|
$old_from = ini_get('sendmail_from');
|
|
ini_set('sendmail_from', $this->Sender);
|
|
@@ -2317,4 +2317,4 @@ class phpmailerException extends Exception {
|
|
return $errorMsg;
|
|
}
|
|
}
|
|
-?>
|
|
\ No newline at end of file
|
|
+?>
|