Changeset 4468 in subversion

Timestamp:

Jan 29, 2011 9:27:00 AM (2 years ago)

Author:

thomasb

Message:

Check mime headers before attempt to parse them (#1487745); broken since r4421

Location:

trunk/roundcubemail

Files:

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

trunk/roundcubemail/CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Check mime headers before attempt to parse them (#1487745)
+- Quote header values in show_additional_headers plugin (#1487744)
 - Fix settings UI on IE 6 (#1487724)
 - Remove double borders in folder listing (#1487713)

trunk/roundcubemail/program/include/rcube_imap.php

@@ -2239 +2239 @@
                     $this->mailbox, $this->_msg_id, false, $struct->mime_id);
             }
-            $struct->headers = $this->_parse_headers($mime_headers) + $struct->headers;
+
+            if (is_string($mime_headers))
+                $struct->headers = $this->_parse_headers($mime_headers) + $struct->headers;
+            else if (is_object($mime_headers))
+                $struct->headers = get_object_vars($mime_headers) + $struct->headers;
 
             // get real content-type of message/rfc822