Skip to content

Commit c108c22

Browse files
author
Till Brehm
committed
Merge branch 'stable-3.0.5' into 'stable-3.0.5'
Fix notification mail template header-body splitting Since file() doesn't remove "\n" from the lines read the condition `$lines[$l] == ''` never evaluated to true. So $mailHeaders would always contain every line from the template while $mailBody contained none of them. Together with the bugfix of PHP#68776 [1] disallowing multiple "\n"'s & preceding "\n" in mail()'s $additionalHeaders arg this caused mails not being sent because $mailHeaders would include at least one "\n\n" which was meant to separate the mail headers from the body. [1] https://bugs.php.net/bug.php?id=68776 See merge request !231
2 parents 1414802 + 2110eb5 commit c108c22

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

server/cron_daily.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -670,7 +670,7 @@ function send_notification_email($template, $placeholders, $recipients) {
670670
$mailSubject = '';
671671
$inHeader = true;
672672
for($l = 0; $l < count($lines); $l++) {
673-
if($lines[$l] == '') {
673+
if(trim($lines[$l]) == '') {
674674
$inHeader = false;
675675
continue;
676676
}

0 commit comments

Comments
 (0)