Changeset 2154 in subversion for trunk/roundcubemail/program/lib/Mail/mimePart.php

Timestamp:

Dec 16, 2008 7:37:05 AM (4 years ago)

Author:

alec

Message:

#1485607: fix charset setting for attachments when sending the message

File:

• trunk/roundcubemail/program/lib/Mail/mimePart.php (modified) (2 diffs)

trunk/roundcubemail/program/lib/Mail/mimePart.php

@@ -186 +186 @@
         if (isset($contentType['type'])) {
             $headers['Content-Type'] = $contentType['type'];
+            if (isset($contentType['charset'])) {
+                $headers['Content-Type'] .= "; charset=\"{$contentType['charset']}\"";
+            }
             if (isset($contentType['name'])) {
                 $headers['Content-Type'] .= ';' . MAIL_MIMEPART_CRLF;
@@ -193 +196 @@
                         isset($contentType['language']) ? $contentType['language'] : NULL,
                         isset($params['name-encoding']) ?  $params['name-encoding'] : NULL);
-            } elseif (isset($contentType['charset'])) {
-                $headers['Content-Type'] .= "; charset=\"{$contentType['charset']}\"";
             }
         }