summaryrefslogtreecommitdiff
path: root/program/include
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2011-01-29 14:27:00 +0000
committerthomascube <thomas@roundcube.net>2011-01-29 14:27:00 +0000
commitd755eade08a562c34669280f855f7f0178081f61 (patch)
tree00f2e283ee33eb9478afb67272c53ba9c26ba604 /program/include
parent6039aae3878aa5880415290cbc41af4bac4fdcb5 (diff)
Check mime headers before attempt to parse them (#1487745); broken since r4421
Diffstat (limited to 'program/include')
-rw-r--r--program/include/rcube_imap.php6
1 files changed, 5 insertions, 1 deletions
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') {