diff options
| author | Aleksander Machniak <alec@alec.pl> | 2014-08-05 13:07:53 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2014-08-05 13:08:58 +0200 |
| commit | 8d4b4897df1861c12b033b864f4d7d8fca7e540a (patch) | |
| tree | 574892327fb196f700b5f8d50c9bc17131d3fd2b /program/steps | |
| parent | 1fac787d2cedc2ada103418bf91895b3edf1dd8f (diff) | |
Fix invalid Content-Type header when send_format_flowed=false (#1489992)
Diffstat (limited to 'program/steps')
| -rw-r--r-- | program/steps/mail/sendmail.inc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc index 13a8a24a9..6c4006426 100644 --- a/program/steps/mail/sendmail.inc +++ b/program/steps/mail/sendmail.inc @@ -467,15 +467,11 @@ if (preg_match('/[^\x00-\x7F]/', $MAIL_MIME->getTXTBody())) { $transfer_encoding = $RCMAIL->config->get('force_7bit') ? 'quoted-printable' : '8bit'; } else { - $text_charset = ''; + $text_charset = 'US-ASCII'; $transfer_encoding = '7bit'; } if ($flowed) { - if (!$text_charset) { - $text_charset = 'US-ASCII'; - } - $text_charset .= ";\r\n format=flowed"; } |