summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2010-11-22 17:36:03 +0000
committeralecpl <alec@alec.pl>2010-11-22 17:36:03 +0000
commit57388f9cce148fbbeaebb84b16bef4cbed322a89 (patch)
tree9547d25be5afe72d26abb76e9f353496761ea5a4 /program
parent11a61a8ab399bd3236a0da7e10dd2bd79e783e46 (diff)
- Fix attachment names encoding broken in r4232
Diffstat (limited to 'program')
-rw-r--r--program/steps/mail/sendmail.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index 54ded7af0..796e7782b 100644
--- a/program/steps/mail/sendmail.inc
+++ b/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
);