|
@@ -7861,13 +7861,14 @@ function api_mail_html(
|
|
|
$defaultEmail = $notification->getDefaultPlatformSenderEmail();
|
|
|
$defaultName = $notification->getDefaultPlatformSenderName();
|
|
|
|
|
|
- // Error to admin.
|
|
|
- $mail->AddCustomHeader('Errors-To: '.$defaultEmail);
|
|
|
-
|
|
|
// If the parameter is set don't use the admin.
|
|
|
$senderName = !empty($senderName) ? $senderName : $defaultName;
|
|
|
$senderEmail = !empty($senderEmail) ? $senderEmail : $defaultEmail;
|
|
|
|
|
|
+ // Errors to sender
|
|
|
+ $mail->AddCustomHeader('Errors-To: '.$senderEmail);
|
|
|
+ $mail->AddCustomHeader('envelope-from: '.$defaultEmail);
|
|
|
+
|
|
|
// Reply to first
|
|
|
if (isset($extra_headers['reply_to'])) {
|
|
|
$mail->AddReplyTo(
|
|
@@ -7995,6 +7996,7 @@ function api_mail_html(
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+
|
|
|
// WordWrap the html body (phpMailer only fixes AltBody) FS#2988
|
|
|
$mail->Body = $mail->WrapText($mail->Body, $mail->WordWrap);
|
|
|
|