diff options
Diffstat (limited to 'inc/mail.php')
| -rw-r--r-- | inc/mail.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/inc/mail.php b/inc/mail.php index da2368af2..a596c38f7 100644 --- a/inc/mail.php +++ b/inc/mail.php @@ -9,7 +9,9 @@ if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/'); require_once(DOKU_INC.'inc/utf8.php'); - define('MAILHEADER_EOL',"\n"); //end of line for mail headers + // end of line for mail lines - RFC822 says CRLF but postfix (and other MTAs?) + // think different + if(!defined('MAILHEADER_EOL')) define('MAILHEADER_EOL',"\n"); #define('MAILHEADER_ASCIIONLY',1); /** @@ -210,12 +212,12 @@ function mail_quotedprintable_encode($sText,$maxlen=74,$bEmulate_imap_8bit=true) // but this wouldn't be caught by such an easy RegExp if($maxlen){ preg_match_all( '/.{1,'.($maxlen - 2).'}([^=]{0,2})?/', $sLine, $aMatch ); - $sLine = implode( '=' . chr(13).chr(10), $aMatch[0] ); // add soft crlf's + $sLine = implode( '=' . MAILHEADER_EOL, $aMatch[0] ); // add soft crlf's } } // join lines into text - return implode(chr(13).chr(10),$aLines); + return implode(MAILHEADER_EOL,$aLines); } |