summaryrefslogtreecommitdiff
path: root/program/include/rcube_message.php
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2012-04-15 08:22:07 +0000
committeralecpl <alec@alec.pl>2012-04-15 08:22:07 +0000
commitce6ece3ce067b4a17f90e8b0932ada54a617b98c (patch)
treedaa087906e48f1686bd29f6a592387488a640b8d /program/include/rcube_message.php
parent9456eacbec25fac99d0b13f574aa45575a44b27b (diff)
- Applied fixes from trunk
Diffstat (limited to 'program/include/rcube_message.php')
-rw-r--r--program/include/rcube_message.php10
1 files changed, 6 insertions, 4 deletions
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;
}