summaryrefslogtreecommitdiff
path: root/program/steps
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2014-10-22 15:44:39 +0200
committerAleksander Machniak <alec@alec.pl>2014-10-22 15:44:39 +0200
commitd165d11012a3814b129b3dab6419212bad8e5872 (patch)
treef721f98996aa5aecab198ddbf6194eb77b1e4b62 /program/steps
parentb585fa9ec29e010d061a9b7ef1328a6d31a4e477 (diff)
Fix so attachment charset is set in headers of forward/draft message (#1490109)
Diffstat (limited to 'program/steps')
-rw-r--r--program/steps/mail/compose.inc1
-rw-r--r--program/steps/mail/sendmail.inc3
2 files changed, 3 insertions, 1 deletions
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