diff options
| author | Christopher Smith <chris@jalakai.co.uk> | 2013-10-21 18:54:34 +0100 |
|---|---|---|
| committer | Christopher Smith <chris@jalakai.co.uk> | 2013-10-21 18:54:34 +0100 |
| commit | fa457f5d82989812f1961cb9643c0b55824ba0b3 (patch) | |
| tree | ea4e6325a9a9d760f6603758449a70ac50cc052d /inc/mail.php | |
| parent | 4b94edc8e8badb6bcdc25b41f73310a8e323ba92 (diff) | |
| parent | 7951a37379700f564a20c882a920086b49c473c8 (diff) | |
| download | rpg-fa457f5d82989812f1961cb9643c0b55824ba0b3.tar.gz rpg-fa457f5d82989812f1961cb9643c0b55824ba0b3.tar.bz2 | |
Merge branch 'master' into FS#2867
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 d0ea651bf..0b60c0a5b 100644 --- a/inc/mail.php +++ b/inc/mail.php @@ -284,10 +284,9 @@ function mail_quotedprintable_encode($sText,$maxlen=74,$bEmulate_imap_8bit=true) // for EBCDIC safeness encode !"#$@[\]^`{|}~, // for complete safeness encode every character :) if ($bEmulate_imap_8bit) - $sRegExp = '/[^\x20\x21-\x3C\x3E-\x7E]/e'; + $sRegExp = '/[^\x20\x21-\x3C\x3E-\x7E]/'; - $sReplmt = 'sprintf( "=%02X", ord ( "$0" ) ) ;'; - $sLine = preg_replace( $sRegExp, $sReplmt, $sLine ); + $sLine = preg_replace_callback( $sRegExp, 'mail_quotedprintable_encode_callback', $sLine ); // encode x09,x20 at lineends { @@ -330,3 +329,6 @@ function mail_quotedprintable_encode($sText,$maxlen=74,$bEmulate_imap_8bit=true) return implode(MAILHEADER_EOL,$aLines); } +function mail_quotedprintable_encode_callback($matches){ + return sprintf( "=%02X", ord ( $matches[0] ) ) ; +} |