diff options
| author | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2012-01-27 10:34:19 +0000 |
|---|---|---|
| committer | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2012-01-27 10:34:19 +0000 |
| commit | de30f4fa4ef05f8c34fe04036024833b6278d9bd (patch) | |
| tree | f793ecb8ff93642d28bc2c97151fbfd144ba072d | |
| parent | 2659fd1e15174fdeb28e3bdc42d5ea2e29022cfa (diff) | |
Update requirements list, remove TODO
git-svn-id: https://svn.roundcube.net/trunk@5833 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/INSTALL | 1 | ||||
| -rw-r--r-- | roundcubemail/program/include/rcube_mime.php | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/roundcubemail/INSTALL b/roundcubemail/INSTALL index 493baf70b..d175d6fc3 100644 --- a/roundcubemail/INSTALL +++ b/roundcubemail/INSTALL @@ -18,6 +18,7 @@ REQUIREMENTS * PEAR packages distributed with Roundcube or external: - MDB2 2.5.0 or newer - Mail_Mime 1.8.1 or newer + - Mail_mimeDecode 1.5.5 or newer - Net_SMTP 1.4.2 or newer - Net_IDNA2 0.1.1 or newer - Auth_SASL 1.0.3 or newer 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; |