diff options
| author | kitsiosk <kitsiosk@ece.auth.gr> | 2017-12-09 16:19:41 +0200 |
|---|---|---|
| committer | kitsiosk <kitsiosk@ece.auth.gr> | 2017-12-09 16:19:41 +0200 |
| commit | b4ca1bdb0050b238797431f29faaefdc3057b50a (patch) | |
| tree | 3b3997631e747a9f4fbf76ae5116c42f17eb9a06 /phpBB | |
| parent | 2643e851f2acfe703364d96fb00ab52c38369a5b (diff) | |
| download | forums-b4ca1bdb0050b238797431f29faaefdc3057b50a.tar forums-b4ca1bdb0050b238797431f29faaefdc3057b50a.tar.gz forums-b4ca1bdb0050b238797431f29faaefdc3057b50a.tar.bz2 forums-b4ca1bdb0050b238797431f29faaefdc3057b50a.tar.xz forums-b4ca1bdb0050b238797431f29faaefdc3057b50a.zip | |
[ticket/15322] Fix bug wrong return in emails
PHPBB3-15322
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index ab7f00a65a..dccad1c05c 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -1839,7 +1839,7 @@ function phpbb_mail($to, $subject, $msg, $headers, $eol, &$err_msg) // On some PHP Versions mail() *may* fail if there are newlines within the subject. // Newlines are used as a delimiter for lines in mail_encode() according to RFC 2045 section 6.8. // Because PHP can't decide what is wanted we revert back to the non-RFC-compliant way of separating by one space (Use '' as parameter to mail_encode() results in SPACE used) - $result = $config['email_function_name']($to, mail_encode($subject, ''), wordwrap(utf8_wordwrap($msg), 997, "\n", true), $headers); + $result = $config['email_function_name']($to, mail_encode($subject, ''), wordwrap(utf8_wordwrap($msg), 997, "\n", true), $headers, "-f" . $config['board_email']); $collector->uninstall(); $err_msg = $collector->format_errors(); |