diff options
| author | thomascube <thomas@roundcube.net> | 2011-01-29 14:27:00 +0000 |
|---|---|---|
| committer | thomascube <thomas@roundcube.net> | 2011-01-29 14:27:00 +0000 |
| commit | d755eade08a562c34669280f855f7f0178081f61 (patch) | |
| tree | 00f2e283ee33eb9478afb67272c53ba9c26ba604 | |
| parent | 6039aae3878aa5880415290cbc41af4bac4fdcb5 (diff) | |
Check mime headers before attempt to parse them (#1487745); broken since r4421
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | program/include/rcube_imap.php | 6 |
2 files changed, 7 insertions, 1 deletions
@@ -1,6 +1,8 @@ CHANGELOG Roundcube Webmail =========================== +- 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) - Separate full message headers UI element from headers table (#1487715) diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php index cab232da4..a4e67e140 100644 --- a/program/include/rcube_imap.php +++ b/program/include/rcube_imap.php @@ -2238,7 +2238,11 @@ class rcube_imap $mime_headers = $this->conn->fetchPartHeader( $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 if ($struct->mimetype == 'message/rfc822') { |