diff options
| author | Mitch Jackson <mitch@freeside.biz> | 2018-05-22 23:44:21 -0500 |
|---|---|---|
| committer | Mitch Jackson <mitch@freeside.biz> | 2018-09-29 18:49:53 -0400 |
| commit | a5e01af2ff2d6b291a98a28ceeda0ca0089945ea (patch) | |
| tree | b3df8239f2ad1af05586387d1f9e271cf6606f63 /FS/FS | |
| parent | 088d455c563ca3b75be357727622d968e49b3ed1 (diff) | |
RT# 79705 Correct UTF-8 output for generated E-Mail
Diffstat (limited to 'FS/FS')
| -rw-r--r-- | FS/FS/Template_Mixin.pm | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/FS/FS/Template_Mixin.pm b/FS/FS/Template_Mixin.pm index f197d005a..d3994e57f 100644 --- a/FS/FS/Template_Mixin.pm +++ b/FS/FS/Template_Mixin.pm @@ -2251,8 +2251,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 { @@ -2268,7 +2267,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', ); @@ -2347,7 +2350,11 @@ sub generate_email { ' </title>', ' </head>', ' <body bgcolor="#e8e8e8">', - Encode::encode_utf8($html), + Encode::encode( + 'UTF-8', + $html, + Encode::FB_WARN | Encode::LEAVE_SRC + ), ' </body>', '</html>', ], |