From b6088672c87e2c5984183326b4c0e2d9bd6c34f6 Mon Sep 17 00:00:00 2001
From: Mitch Jackson <mitch@freeside.biz>
Date: Sat, 29 Sep 2018 18:48:39 -0400
Subject: [PATCH] RT# 79705 Correct UTF-8 output for generated E-Mail

---
 FS/FS/Record.pm | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index e951178cc..9dd08cfd8 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -3641,7 +3641,19 @@ sub _quote {
            && driver_name eq 'Pg'
           )
   {
-    dbh->quote($value, { pg_type => PG_BYTEA() });
+    local $@;
+
+    eval { $value = dbh->quote($value, { pg_type => PG_BYTEA() }); };
+
+    if ( $@ && $@ =~ /Wide character/i ) {
+      warn 'Correcting malformed UTF-8 string for binary quote()'
+        if $DEBUG;
+      utf8::decode($value);
+      utf8::encode($value);
+      $value = dbh->quote($value, { pg_type => PG_BYTEA() });
+    }
+
+    $value;
   } else {
     dbh->quote($value);
   }
-- 
2.11.0