From 0f9d8ca40de826733f0507b9706d18dd1e8719f4 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 18 Nov 2010 05:34:10 -0500
Subject: [PATCH] - Don't set attachment's charset in Content-type header (#1487122)
---
program/include/rcube_shared.inc | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/program/include/rcube_shared.inc b/program/include/rcube_shared.inc
index b79ab36..d6d91e0 100644
--- a/program/include/rcube_shared.inc
+++ b/program/include/rcube_shared.inc
@@ -477,9 +477,9 @@
$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;
--
Gitblit v1.9.1