From 77c779a2b807cdde0641267f272517738157edf4 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 27 Jan 2012 05:34:19 -0500
Subject: [PATCH] Update requirements list, remove TODO
---
INSTALL | 1 +
program/include/rcube_mime.php | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/INSTALL b/INSTALL
index 493baf7..d175d6f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -18,6 +18,7 @@
* 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/program/include/rcube_mime.php b/program/include/rcube_mime.php
index bc0b2aa..538c8ea 100644
--- a/program/include/rcube_mime.php
+++ b/program/include/rcube_mime.php
@@ -94,13 +94,13 @@
$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;
--
Gitblit v1.9.1