Fix merge conflict

virtualmin · Dec 2, 2020 · 33b13ef · 33b13ef
2 parents 73db161 + 9e8c295
commit 33b13ef
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/virtual-server-lib-funcs.pl b/virtual-server-lib-funcs.pl
@@ -4423,11 +4423,8 @@ sub send_template_email
 local $ctype = $template =~ /<html[^>]*>|<body[^>]*>/i ? "text/html"
 						       : "text/plain";
 local $cs = &get_charset();
-$ctype .= '; charset='.$cs;
-local $attach = $template =~ /^[\000-\177]*$/ ?
-    { 'headers' => [ [ 'Content-type', $ctype ] ],
-      'data' => &entities_to_ascii($template) } :
-    { 'headers' => [ [ 'Content-Type', $ctype ],
+local $attach =
+    { 'headers' => [ [ 'Content-Type', $ctype.'; charset='.$cs ],
                      [ 'Content-Transfer-Encoding', 'quoted-printable' ] ],
       'data' => &mailboxes::quoted_encode($template) };