Skip to content

Commit d8faa4e

Browse files
author
Till Brehm
committed
Fix by dirkd: 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
1 parent 5cc181a commit d8faa4e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

server/lib/classes/monitor_tools.inc.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -702,7 +702,7 @@ public function send_notification_email($template, $placeholders, $recipients) {
702702
$mailSubject = '';
703703
$inHeader = true;
704704
for($l = 0; $l < count($lines); $l++) {
705-
if($lines[$l] == '') {
705+
if(trim($lines[$l]) == '') {
706706
$inHeader = false;
707707
continue;
708708
}

0 commit comments

Comments
 (0)