Changeset 77c779a in github

Timestamp:

Jan 27, 2012 5:34:19 AM (17 months ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.8

Children:

f6a7491

Parents:

f62b310

Message:

Update requirements list, remove TODO

Files:

• INSTALL (modified) (1 diff)
• program/include/rcube_mime.php (modified) (2 diffs)

INSTALL

@@ -19 +19 @@
    - 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

program/include/rcube_mime.php

@@ -95 +95 @@
         $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);
@@ -101 +101 @@
 
         // 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;