diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-08-18 13:24:45 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-08-18 13:24:45 +0000 |
| commit | 92a17752944b527c3212ed3d477a5804450be93e (patch) | |
| tree | ba753eadd59ff0fd7c73f81173a11eabc60ce2d2 /phpBB | |
| parent | 9bcc38ea0b9a9b2a97b3032c9a528fe8fba0719a (diff) | |
| download | forums-92a17752944b527c3212ed3d477a5804450be93e.tar forums-92a17752944b527c3212ed3d477a5804450be93e.tar.gz forums-92a17752944b527c3212ed3d477a5804450be93e.tar.bz2 forums-92a17752944b527c3212ed3d477a5804450be93e.tar.xz forums-92a17752944b527c3212ed3d477a5804450be93e.zip | |
we will use the non-compliant way for mail() until we further inspected PHP's source.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10015 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index ecd9709f00..847b2e0c46 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -1526,19 +1526,11 @@ function phpbb_mail($to, $subject, $msg, $headers, $eol, &$err_msg) $headers = implode($eol, $headers); ob_start(); - $result = $config['email_function_name']($to, mail_encode($subject, $eol), wordwrap(utf8_wordwrap($msg), 997, "\n", true), $headers); - $err_msg = ob_get_clean(); - - // Try again... // 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. - if (!$result) - { - // Use nothing as delimiter (results in SPACE used) - ob_start(); - $result = $config['email_function_name']($to, mail_encode($subject, ''), wordwrap(utf8_wordwrap($msg), 997, "\n", true), $headers); - $err_msg = ob_get_clean(); - } + // 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); + $err_msg = ob_get_clean(); return $result; } |