diff options
author | alecpl <alec@alec.pl> | 2011-09-13 08:09:50 +0000 |
---|---|---|
committer | alecpl <alec@alec.pl> | 2011-09-13 08:09:50 +0000 |
commit | f593222ef5d5dc3b678618593abb873f4fcd4343 (patch) | |
tree | 9c0cbf374b1b70a795a576ddf07f41b473749a3c /program/include/rcube_imap.php | |
parent | a7c51ac2d032e29e9599a6f64849c24eb1f7f94d (diff) |
- Applied fixes from trunk up to r5212
Diffstat (limited to 'program/include/rcube_imap.php')
-rw-r--r-- | program/include/rcube_imap.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php index dca8961fa..1d258f1e1 100644 --- a/program/include/rcube_imap.php +++ b/program/include/rcube_imap.php @@ -2491,6 +2491,9 @@ class rcube_imap return true; } + // Remove NULL characters (#1486189) + $body = str_replace("\x00", '', $body); + // convert charset (if text or message part) if ($body && !$skip_charset_conv && preg_match('/^(text|message)$/', $o_part->ctype_primary) |