From de30f4fa4ef05f8c34fe04036024833b6278d9bd Mon Sep 17 00:00:00 2001 From: thomasb Date: Fri, 27 Jan 2012 10:34:19 +0000 Subject: Update requirements list, remove TODO git-svn-id: https://svn.roundcube.net/trunk@5833 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/include/rcube_mime.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'roundcubemail/program') diff --git a/roundcubemail/program/include/rcube_mime.php b/roundcubemail/program/include/rcube_mime.php index bc0b2aa8c..538c8ea45 100644 --- a/roundcubemail/program/include/rcube_mime.php +++ b/roundcubemail/program/include/rcube_mime.php @@ -94,13 +94,13 @@ class rcube_mime $part_charset = $struct->charset ? $struct->charset : self::$default_charset; - // TODO: determine filename + // determine filename if (($filename = $part->d_parameters['filename']) || ($filename = $part->ctype_parameters['name'])) { $struct->filename = rcube_mime::decode_mime_string($filename, $part_charset); } // copy part body and convert it to UTF-8 if necessary - $struct->body = $part->ctype_primary == 'text' ? rcube_charset::convert($part->body, $part_charset) : $part->body; + $struct->body = $part->ctype_primary == 'text' || !$part->ctype_parameters['charset'] ? rcube_charset::convert($part->body, $part_charset) : $part->body; $struct->size = strlen($part->body); $struct->disposition = $part->disposition; -- cgit v1.2.3