friendica/friendica-addons
9
4
Fork 16
Code Issues 3 Pull requests 2 Releases 16 Wiki Activity

[phpmailer] Fixes Double Message ID #1020

Merged
nupplaphil merged 2 commits from bug/9142-message-id into 2020.09-rc 2020-09-20 04:11:15 +02:00
Conversation 0 Commits 2 Files changed 2 +5 -3
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 5663e61791 - Show all commits

8
phpmailer/phpmailer.php
View file

@ -91,11 +91,13 @@ function phpmailer_emailer_send_prepare(App $a, IEmail &$email)
// additional headers
if (!empty($email->getAdditionalMailHeader())) {
foreach ($email->getAdditionalMailHeader() as $name => $values) {
// Skip the "Message-ID" header because PHP-Mailer is using its own
// Set the "Message-ID" header for PHP-Mailer directly
if ($name == 'Message-Id') {
continue;
// implode all values to one entry, because there's only one value possible
$mailer->MessageID = trim(implode("", $values));
} else {
$mailer->addCustomHeader(trim($name), trim(implode("\n", $values)));
}
$mailer->addCustomHeader(trim($name), trim(implode("\n", $values)));
}
}