From 54029ea959b5f59447e3f0a01a453fd5fe0ba8fa Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sat, 21 Dec 2013 14:49:00 +0100
Subject: Fix broken text/* attachments when forwarding/editing a message
 (#1489426)

---
 program/steps/mail/compose.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'program/steps/mail/compose.inc')

diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index f75b219ff..aee31bb21 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -1286,12 +1286,12 @@ function rcmail_save_attachment(&$message, $pid)
     $temp_dir = unslashify($rcmail->config->get('temp_dir'));
     $path = tempnam($temp_dir, 'rcmAttmnt');
     if ($fp = fopen($path, 'w')) {
-      $message->get_part_content($pid, $fp);
+      $message->get_part_content($pid, $fp, true, 0, false);
       fclose($fp);
     } else
       return false;
   } else {
-    $data = $message->get_part_content($pid);
+    $data = $message->get_part_content($pid, null, true, 0, false);
   }
 
   $mimetype = $part->ctype_primary . '/' . $part->ctype_secondary;
-- 
cgit v1.2.3