From: Don Armstrong <don@donarmstrong.com>
Date: Mon, 19 Mar 2012 17:45:15 +0000 (-0700)
Subject: encode is_utf8 messages
X-Git-Tag: release/2.6.0~413^2~3
X-Git-Url: https://git.donarmstrong.com/?p=debbugs.git;a=commitdiff_plain;h=84f362177787ddb4ec62841876b2c37b89fb07e7

encode is_utf8 messages
---

diff --git a/Debbugs/Mail.pm b/Debbugs/Mail.pm
index ad2df8c..41a6780 100644
--- a/Debbugs/Mail.pm
+++ b/Debbugs/Mail.pm
@@ -48,6 +48,7 @@ use Mail::Address ();
 use Debbugs::MIME qw(encode_rfc1522);
 use Debbugs::Config qw(:config);
 use Params::Validate qw(:types validate_with);
+use Encode qw(encode is_utf8);
 
 use Debbugs::Packages;
 
@@ -346,6 +347,11 @@ sub send_mail_message{
      if ($param{encode_headers}) {
 	  $param{message} = encode_headers($param{message});
      }
+     eval {
+	 if (is_utf8($param{message})) {
+	     $param{message} = encode('utf8',$param{message});
+	 }
+     };
 
      # First, try to send the message as is.
      eval {