Changeset 4421 in subversion

Timestamp:

Jan 17, 2011 8:36:51 AM (2 years ago)

Author:

alec

Message:

• Workaround for setting charset in case of malformed bodystructure response (#1487700)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/include/rcube_imap.php (modified) (2 diffs)

trunk/roundcubemail/CHANGELOG

@@ -5 +5 @@
 - Require PHP 5.2.1 or greater
 - Fix %h/%z variables in username_domain option (#1487701)
+- Workaround for setting charset in case of malformed bodystructure response (#1487700)
 
 RELEASE 0.5

trunk/roundcubemail/program/include/rcube_imap.php

@@ -2054 +2054 @@
         }
 
-        $struct = &$this->_structure_part($structure);
+        $struct = &$this->_structure_part($structure, 0, '', $headers);
         $struct->headers = get_object_vars($headers);
 
@@ -2184 +2184 @@
             if (isset($struct->ctype_parameters['charset']))
                 $struct->charset = $struct->ctype_parameters['charset'];
+        }
+
+        // #1487700: workaround for lack of charset in malformed structure
+        if (empty($struct->charset) && !empty($mime_headers) && $mime_headers->charset) {
+            $struct->charset = $mime_headers->charset;
         }