From: Mitch Jackson Date: Wed, 23 May 2018 04:44:21 +0000 (-0500) Subject: RT# 79705 Correct UTF-8 output for generated E-Mail X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=596f08196fd33e134009833b6453809789088dc8 RT# 79705 Correct UTF-8 output for generated E-Mail --- diff --git a/FS/FS/Template_Mixin.pm b/FS/FS/Template_Mixin.pm index 4d1079a04..38c506692 100644 --- a/FS/FS/Template_Mixin.pm +++ b/FS/FS/Template_Mixin.pm @@ -2274,8 +2274,7 @@ sub generate_email { warn "$me generating plain text invoice" if $DEBUG; - # 'print_text' argument is no longer used - @text = map Encode::encode_utf8($_), $self->print_text(\%args); + @text = $self->print_text(\%args); } else { @@ -2291,7 +2290,11 @@ sub generate_email { 'Encoding' => 'quoted-printable', 'Charset' => 'UTF-8', #'Encoding' => '7bit', - 'Data' => \@text, + 'Data' => [ + map + { Encode::encode('UTF-8', $_, Encode::FB_WARN | Encode::LEAVE_SRC ) } + @text + ], 'Disposition' => 'inline', ); @@ -2370,7 +2373,11 @@ sub generate_email { ' ', ' ', ' ', - Encode::encode_utf8($html), + Encode::encode( + 'UTF-8', + $html, + Encode::FB_WARN | Encode::LEAVE_SRC + ), ' ', '', ],