diff options
| author | Mitch Jackson <mitch@freeside.biz> | 2018-05-22 23:44:21 -0500 |
|---|---|---|
| committer | Mitch Jackson <mitch@freeside.biz> | 2018-05-22 23:44:21 -0500 |
| commit | 9b69e985d204fea71a283d32ca607c9b4be2f1c5 (patch) | |
| tree | 15aabe7ca2520dc96b3d9a27def8e117878186ff /FS/FS/Template_Mixin.pm | |
| parent | b5876680bf13c72fc9ba00e0ad3b87967b69005c (diff) | |
RT# 79705 Correct UTF-8 output for generated E-Mail
Diffstat (limited to 'FS/FS/Template_Mixin.pm')
| -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 c90e65245..b9514fee1 100644 --- a/FS/FS/Template_Mixin.pm +++ b/FS/FS/Template_Mixin.pm @@ -2273,8 +2273,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 { @@ -2290,7 +2289,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', ); @@ -2369,7 +2372,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>', ], |