Changeset 5253 in subversion

Timestamp:

Sep 20, 2011 2:30:27 PM (20 months ago)

Author:

alec

Message:

• Fix forwarded attachments, broken in r5204

File:

• trunk/roundcubemail/program/include/rcube_imap.php (modified) (1 diff)

trunk/roundcubemail/program/include/rcube_imap.php

@@ -2391 +2391 @@
         }
 
-        // 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)
-        ) {
-            if (!$o_part->charset || strtoupper($o_part->charset) == 'US-ASCII') {
-                $o_part->charset = $this->default_charset;
-            }
-            $body = rcube_charset_convert($body, $o_part->charset);
+        if ($body && preg_match('/^(text|message)$/', $o_part->ctype_primary)) {
+            // Remove NULL characters (#1486189)
+            $body = str_replace("\x00", '', $body);
+
+           if (!$skip_charset_conv) {
+                if (!$o_part->charset || strtoupper($o_part->charset) == 'US-ASCII') {
+                    $o_part->charset = $this->default_charset;
+                }
+                $body = rcube_charset_convert($body, $o_part->charset);
+            }
         }