Closes PHPMailer#861

neo22s · Oct 20, 2016 · 52faee6 · 52faee6
1 parent cf8cd05
commit 52faee6
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/class.phpmailer.php b/class.phpmailer.php
@@ -684,16 +684,20 @@ private function mailPassthru($to, $subject, $body, $header, $params)
  } else {
  $subject = $this->encodeHeader($this->secureHeader($subject));
  }
+
  //Can't use additional_parameters in safe_mode
  //@link http:https://php.net/manual/en/function.mail.php
  if (ini_get('safe_mode') or !$this->UseSendmailOptions) {
  $result = @mail($to, $subject, $body, $header);
- } else {
+ }
+ elseif($params == NULL) {
+ $result = @mail($to, $subject, $body, $header);
+ }
+ else {
  $result = @mail($to, $subject, $body, $header, $params);
  }
  return $result;
  }
-
  /**
  * Output debugging info via user-defined method.
  * Only generates output if SMTP debug output is enabled (@see SMTP::$do_debug).