Till Brehm
2015-09-18 c108c22cb139b55e3adb7e563ab640c4dc8d2305
refs
author Till Brehm <tbrehm@ispconfig.org>
Friday, September 18, 2015 13:38 -0400
committer Till Brehm <tbrehm@ispconfig.org>
Friday, September 18, 2015 13:38 -0400
commitc108c22cb139b55e3adb7e563ab640c4dc8d2305
tree dca548d21e3bcc925b6e5383194c953a24beb3fa tree | zip | gz
parent 141480275e1407308d7479ca952ba96f64bd90b7 view | diff
2110eb584f931d41ea1265240ab0cd320c4facff view | diff
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
1 files modified
2 ■■■ changed files
server/cron_daily.php 2 ●●● diff | view | raw | blame | history