diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-05-20 08:34:17 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-05-20 08:34:17 +0000 |
| commit | 3da7f008e71a06d0f3f6058597c4275c32df8bac (patch) | |
| tree | ef7871a1b20669a28a611d833e4fe7ee8bdabe73 | |
| parent | 8ff4c2e1114f503a91560557161c72d69e0c4f43 (diff) | |
- Fix message/rfc822 attachments encoding in sent mail
git-svn-id: https://svn.roundcube.net/trunk@3642 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/program/steps/mail/sendmail.inc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/roundcubemail/program/steps/mail/sendmail.inc b/roundcubemail/program/steps/mail/sendmail.inc index aed7af9ac..e7f5b9557 100644 --- a/roundcubemail/program/steps/mail/sendmail.inc +++ b/roundcubemail/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, |