fix MIME::Entity usage for perl 5.18+, RT#77890

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

index 70bc4fb..c97e84e 100644 (file)
--- a/FS/FS/Template_Mixin.pm
+++ b/FS/FS/Template_Mixin.pm
@@ -2107,6 +2107,7 @@ Returns an argument list to be passed to L<FS::Misc::send_email>.
  =cut
  
  use MIME::Entity;
+use Encode;
  
  sub generate_email {
  
@@ -2174,7 +2175,7 @@ sub generate_email {
          if $DEBUG;
  
        # 'print_text' argument is no longer used
-      @text = $self->print_text(\%args);
+      @text = map Encode::encode_utf8($_), $self->print_text(\%args);
  
      } else {
  
@@ -2269,7 +2270,7 @@ sub generate_email {
                           '    </title>',
                           '  </head>',
                           '  <body bgcolor="#e8e8e8">',
-                         $html,
+                         Encode::encode_utf8($html),
                           '  </body>',
                           '</html>',
                         ],