Skip to content

Commit 6eaec68

Browse files
neo22sSynchro
authored andcommitted
* Closes PHPMailer#861 * Update class.phpmailer.php
1 parent cf8cd05 commit 6eaec68

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

class.phpmailer.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -684,16 +684,16 @@ private function mailPassthru($to, $subject, $body, $header, $params)
684684
} else {
685685
$subject = $this->encodeHeader($this->secureHeader($subject));
686686
}
687+
687688
//Can't use additional_parameters in safe_mode
688689
//@link http://php.net/manual/en/function.mail.php
689-
if (ini_get('safe_mode') or !$this->UseSendmailOptions) {
690+
if (ini_get('safe_mode') or !$this->UseSendmailOptions or is_null($params)) {
690691
$result = @mail($to, $subject, $body, $header);
691692
} else {
692693
$result = @mail($to, $subject, $body, $header, $params);
693694
}
694695
return $result;
695696
}
696-
697697
/**
698698
* Output debugging info via user-defined method.
699699
* Only generates output if SMTP debug output is enabled (@see SMTP::$do_debug).

0 commit comments

Comments
 (0)