diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2010-08-29 14:22:01 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2010-08-29 14:22:01 +0200 |
| commit | 2c053ed58376c6709596ab48fc40dceb90d4e89d (patch) | |
| tree | c8d0f78c2f47f373473419396d3c0855ec671eca /inc/mail.php | |
| parent | cb4a07568e84d853fbcd9d5eca37f572fa10786f (diff) | |
| parent | 5479a8c3341247ca228026819f20f3ab5c34a80f (diff) | |
| download | rpg-2c053ed58376c6709596ab48fc40dceb90d4e89d.tar.gz rpg-2c053ed58376c6709596ab48fc40dceb90d4e89d.tar.bz2 | |
Merge branch 'master' into stable
Conflicts:
conf/msg
lib/plugins/acl/ajax.php
Diffstat (limited to 'inc/mail.php')
| -rw-r--r-- | inc/mail.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/inc/mail.php b/inc/mail.php index 3b0592b8b..38232d110 100644 --- a/inc/mail.php +++ b/inc/mail.php @@ -7,12 +7,11 @@ */ if(!defined('DOKU_INC')) die('meh.'); -require_once(DOKU_INC.'inc/utf8.php'); -require_once(DOKU_INC.'inc/EmailAddressValidator.php'); // end of line for mail lines - RFC822 says CRLF but postfix (and other MTAs?) // think different if(!defined('MAILHEADER_EOL')) define('MAILHEADER_EOL',"\n"); +if(!defined('QUOTEDPRINTABLE_EOL')) define('QUOTEDPRINTABLE_EOL',"\015\012"); #define('MAILHEADER_ASCIIONLY',1); /** @@ -256,11 +255,11 @@ 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( '=' . MAILHEADER_EOL, $aMatch[0] ); // add soft crlf's + $sLine = implode( '=' . QUOTEDPRINTABLE_EOL, $aMatch[0] ); // add soft crlf's } } // join lines into text - return implode(MAILHEADER_EOL,$aLines); + return implode(QUOTEDPRINTABLE_EOL,$aLines); } |