From 8f75dae9e468affb656033b6076645a16b861865 Mon Sep 17 00:00:00 2001
From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Wed, 29 Jun 2011 15:04:50 +0200
Subject: [PATCH] When a part is explicitly marked as an attachment, obey.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---
 banana/banana.inc.php.in | 2 +-
 banana/mimepart.inc.php  | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/banana/banana.inc.php.in b/banana/banana.inc.php.in
index 0bee982..d28cbbc 100644
--- a/banana/banana.inc.php.in
+++ b/banana/banana.inc.php.in
@@ -716,7 +716,7 @@ class Banana
             && isset($_SESSION['banana_message'])) {
             $message = unserialize($_SESSION['banana_message']);
             Banana::$msgshow_headers = $_SESSION['banana_showhdr'];
-        }  else {
+        } else {
             $message = Banana::$protocole->getMessage($artid);
             $_SESSION['banana_group'] = $group;
             $_SESSION['banana_artid'] = $artid;
diff --git a/banana/mimepart.inc.php b/banana/mimepart.inc.php
index 28281e9..032ae4d 100644
--- a/banana/mimepart.inc.php
+++ b/banana/mimepart.inc.php
@@ -183,6 +183,10 @@ class BananaMimePart
             }
         }
         list($type, $subtype) = explode('/', $content_type);
+        if ($disposition == 'attachment') {
+            $this->makeDataPart($content, $content_type, $encoding, $filename, $disposition, $id);
+            return;
+        }
         switch ($type) {
           case 'text': case 'message':
             $this->makeTextPart($content, $content_type, $encoding, $charset, $format);
-- 
2.1.4