Skip to content
Browse files

Update requirements list, remove TODO

  • Loading branch information...
1 parent f62b310 commit 77c779a2b807cdde0641267f272517738157edf4 @thomascube thomascube committed Jan 27, 2012
Showing with 3 additions and 2 deletions.
  1. +1 −0 INSTALL
  2. +2 −2 program/include/rcube_mime.php
View
1 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
View
4 program/include/rcube_mime.php
@@ -94,13 +94,13 @@ private static function structure_part($part, $count=0, $parent='')
$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;

0 comments on commit 77c779a

Please sign in to comment.
Something went wrong with that request. Please try again.