From 0f9d8ca40de826733f0507b9706d18dd1e8719f4 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 18 Nov 2010 10:34:10 +0000
Subject: - Don't set attachment's charset in Content-type header (#1487122)

---
 program/include/rcube_shared.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'program/include/rcube_shared.inc')

diff --git a/program/include/rcube_shared.inc b/program/include/rcube_shared.inc
index b79ab367e..d6d91e03f 100644
--- a/program/include/rcube_shared.inc
+++ b/program/include/rcube_shared.inc
@@ -477,9 +477,9 @@ function rc_mime_content_type($path, $name, $failover = 'application/octet-strea
         $mime_type = $failover;
     }
     else {
-        // sometimes content-type contains charset definition,
-        // remove useless "charset=binary", should we remove any charset def. here?
-        $mime_type = preg_replace('/; charset=binary;*/i', '', $mime_type);
+        // Sometimes (PHP-5.3?) content-type contains charset definition,
+        // Remove it (#1487122) also "charset=binary" is useless
+        $mime_type = array_shift(preg_split('/[; ]/', $mime_type));
     }
 
     return $mime_type;
-- 
cgit v1.2.3