- Don't set attachment's charset in Content-type header (#1487122)

git-svn-id: https://svn.roundcube.net/trunk@4232 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 3 insertions, 3 deletions

diff --git a/roundcubemail/program/include/rcube_shared.inc b/roundcubemail/program/include/rcube_shared.inc
index b79ab367e..d6d91e03f 100644
--- a/roundcubemail/program/include/rcube_shared.inc
+++ b/roundcubemail/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;