From 8d4b4897df1861c12b033b864f4d7d8fca7e540a Mon Sep 17 00:00:00 2001 From: Aleksander Machniak <alec@alec.pl> Date: Tue, 05 Aug 2014 07:08:58 -0400 Subject: [PATCH] Fix invalid Content-Type header when send_format_flowed=false (#1489992) --- 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 13a8a24..6c40064 100644 --- a/program/steps/mail/sendmail.inc +++ b/program/steps/mail/sendmail.inc @@ -467,15 +467,11 @@ $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"; } -- Gitblit v1.9.1