diff options
| author | Mitch Jackson <mitch@freeside.biz> | 2018-05-22 23:44:21 -0500 |
|---|---|---|
| committer | Mitch Jackson <mitch@freeside.biz> | 2018-07-18 22:04:09 +0000 |
| commit | 596f08196fd33e134009833b6453809789088dc8 (patch) | |
| tree | 104e126dc3cabdbff8910fcd2cbeefa1f823333a | |
| parent | 95b5826ecc5685680480367d9fe531d03f735233 (diff) | |
RT# 79705 Correct UTF-8 output for generated E-Mail
| -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 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 { ' </title>', ' </head>', ' <body bgcolor="#e8e8e8">', - Encode::encode_utf8($html), + Encode::encode( + 'UTF-8', + $html, + Encode::FB_WARN | Encode::LEAVE_SRC + ), ' </body>', '</html>', ], |