diff options
author | fiwswe <53953985+fiwswe@users.noreply.github.com> | 2022-09-19 19:12:45 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-09-19 19:12:45 +0200 |
commit | b9baf069fb86ba8adabb55630beeb12be30cfea0 (patch) | |
tree | c65ae30393c26776ca78059d525fb78f9f86d7f2 /inc/mail.php | |
parent | e21332f8c2d78a3ef591b9dfad4ff8d5bddde1bc (diff) | |
download | dokuwiki-b9baf069fb86ba8adabb55630beeb12be30cfea0.tar.gz dokuwiki-b9baf069fb86ba8adabb55630beeb12be30cfea0.zip |
Remove PHP version differentiation for MAILHEADER_EOL
Diffstat (limited to 'inc/mail.php')
-rw-r--r-- | inc/mail.php | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/inc/mail.php b/inc/mail.php index 294b2c639..3ab319f95 100644 --- a/inc/mail.php +++ b/inc/mail.php @@ -7,13 +7,8 @@ */ // end of line for mail lines - RFC822 says CRLF but postfix (and other MTAs?) -// think different, also PHP >=8.0.14 mail() has changed. -if(!defined('MAILHEADER_EOL')) { - if (version_compare(phpversion(), '8.0.14') < 0) // See https://github.com/php/php-src/issues/8086 - define('MAILHEADER_EOL', "\n"); - else - define('MAILHEADER_EOL', "\r\n"); -} +// think different, but PHP >=8.0.14 mail() has changed and consensus seems to be not to differentiate for earlier versions. +if(!defined('MAILHEADER_EOL')) define('MAILHEADER_EOL', "\r\n"); #define('MAILHEADER_ASCIIONLY',1); /** |