Merge pull request #4154 from Nicofuma/ticket/14444

[ticket/14444] Fix fatal error in functions_messenger.php
This commit is contained in:
Marc Alexander 2016-02-02 15:52:43 +01:00
commit b432f33b49

View file

@ -1733,7 +1733,7 @@ function mail_encode($str, $eol = "\r\n")
*/ */
function phpbb_mail($to, $subject, $msg, $headers, $eol, &$err_msg) function phpbb_mail($to, $subject, $msg, $headers, $eol, &$err_msg)
{ {
global $phpbb_root_path, $phpEx; global $config, $phpbb_root_path, $phpEx;
// We use the EOL character for the OS here because the PHP mail function does not correctly transform line endings. On Windows SMTP is used (SMTP is \r\n), on UNIX a command is used... // We use the EOL character for the OS here because the PHP mail function does not correctly transform line endings. On Windows SMTP is used (SMTP is \r\n), on UNIX a command is used...
// Reference: http://bugs.php.net/bug.php?id=15841 // Reference: http://bugs.php.net/bug.php?id=15841