diff options
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/include/rcube_imap.php | 3 | ||||
| -rw-r--r-- | program/include/rcube_imap_generic.php | 2 |
3 files changed, 4 insertions, 2 deletions
@@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Fix handling of binary attachments encoded with quoted-printable (#1488065) - Fix text-overflow:ellipsis issues on messages list in FF7 and Webkit (#1488061) - Fix setting title for truncated subject in IE (#1487128) - Fix handling of links with IP address diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php index dfbee76c0..ce8bb0f6d 100644 --- a/program/include/rcube_imap.php +++ b/program/include/rcube_imap.php @@ -2386,6 +2386,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) diff --git a/program/include/rcube_imap_generic.php b/program/include/rcube_imap_generic.php index 65b20254e..be520d3b1 100644 --- a/program/include/rcube_imap_generic.php +++ b/program/include/rcube_imap_generic.php @@ -2470,8 +2470,6 @@ class rcube_imap_generic } else if ($mode == 2) { $line = rtrim($line, "\t\r\0\x0B"); $line = quoted_printable_decode($line); - // Remove NULL characters (#1486189) - $line = str_replace("\x00", '', $line); // UUENCODE } else if ($mode == 3) { $line = rtrim($line, "\t\r\n\0\x0B"); |