diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-12-13 21:31:07 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-12-13 21:31:07 +0100 |
| commit | 4e045ed767603547d6aa9126d22a42bd690a1dd1 (patch) | |
| tree | 181da44bf9525c64dd0344bd6ad7b77d2dd21308 /phpBB/includes/functions_messenger.php | |
| parent | 9f055e1af39f36ff18cc278093000cb30c858885 (diff) | |
| download | forums-4e045ed767603547d6aa9126d22a42bd690a1dd1.tar forums-4e045ed767603547d6aa9126d22a42bd690a1dd1.tar.gz forums-4e045ed767603547d6aa9126d22a42bd690a1dd1.tar.bz2 forums-4e045ed767603547d6aa9126d22a42bd690a1dd1.tar.xz forums-4e045ed767603547d6aa9126d22a42bd690a1dd1.zip | |
[ticket/15322] Try to make new email setting more readable
PHPBB3-15322
Diffstat (limited to 'phpBB/includes/functions_messenger.php')
| -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 2447a7d9cf..4eda5ac6cb 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) - $additional_parameters = $config['email_envelope_sender'] ? '-f' . $config['board_email'] : ''; + $additional_parameters = $config['email_force_sender'] ? '-f' . $config['board_email'] : ''; $result = mail($to, mail_encode($subject, ''), wordwrap(utf8_wordwrap($msg), 997, "\n", true), $headers, $additional_parameters); $collector->uninstall(); |