From: Mitch Jackson <mitch@freeside.biz>
Date: Sat, 29 Sep 2018 22:48:39 +0000 (-0400)
Subject: RT# 79705 Correct UTF-8 output for generated E-Mail
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=07e67fc794333105b8832ff4f9aa70d407c6b8f3;hp=a5e01af2ff2d6b291a98a28ceeda0ca0089945ea

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

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 5048e4407..89957cb47 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -3434,7 +3434,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);
   }