diff options
| author | Aleksander Machniak <alec@alec.pl> | 2014-10-22 15:44:39 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2014-10-22 15:44:39 +0200 |
| commit | d165d11012a3814b129b3dab6419212bad8e5872 (patch) | |
| tree | f721f98996aa5aecab198ddbf6194eb77b1e4b62 | |
| parent | b585fa9ec29e010d061a9b7ef1328a6d31a4e477 (diff) | |
Fix so attachment charset is set in headers of forward/draft message (#1490109)
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/steps/mail/compose.inc | 1 | ||||
| -rw-r--r-- | program/steps/mail/sendmail.inc | 3 |
3 files changed, 4 insertions, 1 deletions
@@ -49,6 +49,7 @@ CHANGELOG Roundcube Webmail - Don't remove links when html signature is converted to text (#1489621) - Fix page title when using search filter (#1490023) - Fix mbox files import +- Fix so attachment charset is set in headers of forward/draft message (#1490109) - Fix bug where wrong charset could be used for text attachment preview page (#1490106) - Fix setting flags on servers with no PERMANENTFLAGS response (#1490087) - Fix regression in SHAA password generation in ldap driver of password plugin (#1490094) diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index 2b1ca4de6..9b6d0dcc9 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -1377,6 +1377,7 @@ function rcmail_save_attachment(&$message, $pid) 'data' => $data, 'path' => $path, 'size' => $path ? filesize($path) : strlen($data), + 'charset' => $part->charset, ); $attachment = $rcmail->plugins->exec_hook('attachment_save', $attachment); diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc index bac751298..68878d790 100644 --- a/program/steps/mail/sendmail.inc +++ b/program/steps/mail/sendmail.inc @@ -469,7 +469,8 @@ if (is_array($COMPOSE['attachments'])) { $attachment['data'] ? false : true, $ctype == 'message/rfc822' ? '8bit' : 'base64', 'attachment', - '', '', '', + $attachment['charset'], + '', '', $folding ? 'quoted-printable' : NULL, $folding == 2 ? 'quoted-printable' : NULL, '', RCUBE_CHARSET |