makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'prep-release-3.3.9' into 3.3.x

Browse source
This commit is contained in:
Marc Alexander 2022-11-14 20:07:55 +01:00
commit c2968212d8
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/includes/functions_messenger.php
View file

@ -597,7 +597,7 @@ class messenger
$this->from = $board_contact; $this->from = $board_contact;
} }
$encode_eol = ($config['smtp_delivery']) ? "\r\n" : PHP_EOL; $encode_eol = $config['smtp_delivery'] || PHP_VERSION_ID >= 80000 ? "\r\n" : PHP_EOL;
// Build to, cc and bcc strings // Build to, cc and bcc strings
$to = $cc = $bcc = ''; $to = $cc = $bcc = '';
@ -629,7 +629,7 @@ class messenger
} }
else else
{ {
$result = phpbb_mail($mail_to, $this->subject, $this->msg, $headers, PHP_EOL, $err_msg); $result = phpbb_mail($mail_to, $this->subject, $this->msg, $headers, $encode_eol, $err_msg);
} }
if (!$result) if (!$result)
@ -952,7 +952,8 @@ class queue
} }
else else
{ {
$result = phpbb_mail($to, $subject, $msg, $headers, PHP_EOL, $err_msg); $encode_eol = $config['smtp_delivery'] || PHP_VERSION_ID >= 80000 ? "\r\n" : PHP_EOL;
$result = phpbb_mail($to, $subject, $msg, $headers, $encode_eol, $err_msg);
} }
if (!$result) if (!$result)