From 16f639a499f7af6a363bbdf09bb282b095332e75 Mon Sep 17 00:00:00 2001 From: alec Date: Wed, 26 Oct 2011 11:35:00 +0000 Subject: - Fix getting message part data from structure, fixes r5363 git-svn-id: https://svn.roundcube.net/trunk@5365 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/include/rcube_imap.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'roundcubemail/program/include/rcube_imap.php') diff --git a/roundcubemail/program/include/rcube_imap.php b/roundcubemail/program/include/rcube_imap.php index 834a63938..d2f954733 100644 --- a/roundcubemail/program/include/rcube_imap.php +++ b/roundcubemail/program/include/rcube_imap.php @@ -2376,14 +2376,16 @@ class rcube_imap */ function &get_message_part($uid, $part=1, $o_part=NULL, $print=NULL, $fp=NULL, $skip_charset_conv=false) { - // get part encoding if not provided + // get part data if not provided if (!is_object($o_part)) { $structure = $this->conn->getStructure($this->mailbox, $uid, true); + $part_data = rcube_imap_generic::getStructurePartData($structure, $part); $o_part = new rcube_message_part; - $o_part->ctype_primary = strtolower(rcube_imap_generic::getStructurePartType($structure, $part)); - $o_part->encoding = strtolower(rcube_imap_generic::getStructurePartEncoding($structure, $part)); - $o_part->charset = rcube_imap_generic::getStructurePartCharset($structure, $part); + $o_part->ctype_primary = $part_data['type']; + $o_part->encoding = $part_data['encoding']; + $o_part->charset = $part_data['charset']; + $o_part->size = $part_data['size']; } if ($o_part && $o_part->size) { -- cgit v1.2.3