From ce6ece3ce067b4a17f90e8b0932ada54a617b98c Mon Sep 17 00:00:00 2001 From: alecpl Date: Sun, 15 Apr 2012 08:22:07 +0000 Subject: - Applied fixes from trunk --- program/include/rcube_message.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'program') diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php index 76246a2d8..58f851039 100644 --- a/program/include/rcube_message.php +++ b/program/include/rcube_message.php @@ -164,11 +164,13 @@ class rcube_message /** * Get content of a specific part of this message * - * @param string $mime_id Part MIME-ID - * @param resource $fp File pointer to save the message part + * @param string $mime_id Part MIME-ID + * @param resource $fp File pointer to save the message part + * @param boolean $skip_charset_conv Disables charset conversion + * * @return string Part content */ - public function get_part_content($mime_id, $fp=NULL) + public function get_part_content($mime_id, $fp = null, $skip_charset_conv = false) { if ($part = $this->mime_parts[$mime_id]) { // stored in message structure (winmail/inline-uuencode) @@ -179,7 +181,7 @@ class rcube_message return $fp ? true : $part->body; } // get from IMAP - return $this->storage->get_message_part($this->uid, $mime_id, $part, NULL, $fp); + return $this->storage->get_message_part($this->uid, $mime_id, $part, NULL, $fp, $skip_charset_conv); } else return null; } -- cgit v1.2.3