diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-11-18 10:34:10 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-11-18 10:34:10 +0000 |
| commit | 8ee923b6f190fb614f451d7ffd3a89fb356a0788 (patch) | |
| tree | ef98828810fdb061546d577c62d66e7c9eb26c19 | |
| parent | 6bfc2f4513eeea50884cc9127144a532d8efcb14 (diff) | |
- 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
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/program/include/rcube_shared.inc | 6 | ||||
| -rw-r--r-- | roundcubemail/program/steps/mail/sendmail.inc | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index 4004eaacf..761030b12 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -73,6 +73,7 @@ CHANGELOG Roundcube Webmail - Fix focused elements aren't unfocused when clicking on the list (#1487123) - Fix error in MSSQL DDL scripts (#1487112) - Lock submit button in onsubmit event on login page (#1487036) +- Don't set attachment's charset in Content-type header (#1487122) RELEASE 0.4.2 ------------- 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; diff --git a/roundcubemail/program/steps/mail/sendmail.inc b/roundcubemail/program/steps/mail/sendmail.inc index c8ceb8f80..81e5a214e 100644 --- a/roundcubemail/program/steps/mail/sendmail.inc +++ b/roundcubemail/program/steps/mail/sendmail.inc @@ -503,7 +503,7 @@ if (is_array($_SESSION['compose']['attachments'])) ($attachment['data'] ? false : true), ($ctype == 'message/rfc822' ? '8bit' : 'base64'), ($ctype == 'message/rfc822' ? 'inline' : 'attachment'), - $message_charset, '', '', + '', '', '', $CONFIG['mime_param_folding'] ? 'quoted-printable' : NULL, $CONFIG['mime_param_folding'] == 2 ? 'quoted-printable' : NULL ); |