RT# 79705 Correct UTF-8 output for generated E-Mail

[freeside.git] / FS / FS / Template_Mixin.pm
diff --git a/FS/FS/Template_Mixin.pm b/FS/FS/Template_Mixin.pm

index c90e652..b9514fe 100644 (file)
--- 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>',
                         ],