diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2011-02-06 20:50:58 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2011-02-06 20:52:57 +0100 |
| commit | 1a6a1c042a16fc7ed8be4d870dbf32d60c05560b (patch) | |
| tree | 4a1242a21a968f3b9ce5cfc90a5b870b436c3ddc /inc/mail.php | |
| parent | 4c5a5d3dd4fcc2636b2861f06d52a2ac32ad5544 (diff) | |
| download | rpg-1a6a1c042a16fc7ed8be4d870dbf32d60c05560b.tar.gz rpg-1a6a1c042a16fc7ed8be4d870dbf32d60c05560b.tar.bz2 | |
Revert "use CRLF in quoted printable encoding FS#1755"
This research suggests that, the change does not help, but in fact
breaks previoulsy working setups:
https://bugs.dokuwiki.org/index.php?do=details&task_id=1755#comment3446
I'm still at loss on how to fix this bug.
This reverts commit 2ae68f97446ff6bae5fbbe463eb00312598be840.
Diffstat (limited to 'inc/mail.php')
| -rw-r--r-- | inc/mail.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/inc/mail.php b/inc/mail.php index aa9d195d1..c45a7c57e 100644 --- a/inc/mail.php +++ b/inc/mail.php @@ -11,7 +11,6 @@ if(!defined('DOKU_INC')) die('meh.'); // 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); /** @@ -290,11 +289,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( '=' . QUOTEDPRINTABLE_EOL, $aMatch[0] ); // add soft crlf's + $sLine = implode( '=' . MAILHEADER_EOL, $aMatch[0] ); // add soft crlf's } } // join lines into text - return implode(QUOTEDPRINTABLE_EOL,$aLines); + return implode(MAILHEADER_EOL,$aLines); } |