diff options
| author | alecpl <alec@alec.pl> | 2010-05-20 08:34:17 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2010-05-20 08:34:17 +0000 |
| commit | dc9d750e18bafb71776921ce6fac0c4e8bff994d (patch) | |
| tree | 42dd4437b688e3dfa1e1883e79d4ab68f5f5561e | |
| parent | 24c91ed78e64cb20b2ba08971d2c35979a2de856 (diff) | |
- Fix message/rfc822 attachments encoding in sent mail
| -rw-r--r-- | program/steps/mail/sendmail.inc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc index aed7af9ac..e7f5b9557 100644 --- a/program/steps/mail/sendmail.inc +++ b/program/steps/mail/sendmail.inc @@ -466,7 +466,7 @@ if (is_array($_SESSION['compose']['attachments'])) if ($isHtml && (preg_match($dispurl, $message_body) > 0)) { $message_body = preg_replace($dispurl, ' src="'.$attachment['name'].'" ', $message_body); $MAIL_MIME->setHTMLBody($message_body); - + if ($attachment['data']) $MAIL_MIME->addHTMLImage($attachment['data'], $attachment['mimetype'], $attachment['name'], false); else @@ -481,9 +481,7 @@ if (is_array($_SESSION['compose']['attachments'])) $ctype, $attachment['name'], ($attachment['data'] ? false : true), - // @TODO: quoted-printable for message/rfc822 is safe, - // but we should check that 7bit or 8bit is possible here - ($ctype == 'message/rfc822' ? 'quoted-printable' : 'base64'), + ($ctype == 'message/rfc822' ? '8bit' : 'base64'), ($ctype == 'message/rfc822' ? 'inline' : 'attachment'), $message_charset, '', '', $CONFIG['mime_param_folding'] ? 'quoted-printable' : NULL, |