summaryrefslogtreecommitdiff
path: root/roundcubemail/program/steps
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2010-11-22 17:36:03 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2010-11-22 17:36:03 +0000
commit023ef79a0fc407c02c0c33aa97fb3d060f306be2 (patch)
treecc0ed33c6339b012c5ca0cc7195869232826720d /roundcubemail/program/steps
parenta12b9a8bc1313193d1b8f677d174333647f0aa9b (diff)
- Fix attachment names encoding broken in r4232
git-svn-id: https://svn.roundcube.net/trunk@4249 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/steps')
-rw-r--r--roundcubemail/program/steps/mail/sendmail.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/roundcubemail/program/steps/mail/sendmail.inc b/roundcubemail/program/steps/mail/sendmail.inc
index 54ded7af0..796e7782b 100644
--- a/roundcubemail/program/steps/mail/sendmail.inc
+++ b/roundcubemail/program/steps/mail/sendmail.inc
@@ -508,12 +508,12 @@ if (is_array($_SESSION['compose']['attachments']))
// .eml attachments send inline
$MAIL_MIME->addAttachment($file,
- $ctype,
+ $ctype,
$attachment['name'],
($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
);