- remove charset=binary from content-type

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

1 files changed, 5 insertions, 0 deletions

diff --git a/roundcubemail/program/include/rcube_shared.inc b/roundcubemail/program/include/rcube_shared.inc
index fb4a959f6..b79ab367e 100644
--- a/roundcubemail/program/include/rcube_shared.inc
+++ b/roundcubemail/program/include/rcube_shared.inc
@@ -476,6 +476,11 @@ function rc_mime_content_type($path, $name, $failover = 'application/octet-strea
     if (!$mime_type) {
         $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);
+    }
 
     return $mime_type;
 }