From 1c538bfabc2cd31f27067505f0c3d1a46cba6ef0 Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Thu, 9 Jul 2015 22:18:55 -0700
Subject: RT 4.2.11, ticket#13852

---
 rt/share/html/Download/CustomFieldValue/dhandler | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'rt/share/html/Download/CustomFieldValue/dhandler')

diff --git a/rt/share/html/Download/CustomFieldValue/dhandler b/rt/share/html/Download/CustomFieldValue/dhandler
index 45157169c..aba60042f 100644
--- a/rt/share/html/Download/CustomFieldValue/dhandler
+++ b/rt/share/html/Download/CustomFieldValue/dhandler
@@ -61,13 +61,13 @@ unless ($OCFV->id) {
     Abort("Bad OCFV id. Couldn't find OCFV '$id'\n");
 }
 
-my $content_type = $OCFV->ContentType || 'text/plain';
+my $content_type = $OCFV->ContentType || 'text/plain; charset=utf-8';
     
 if (RT->Config->Get('AlwaysDownloadAttachments')) {
     $r->headers_out->{'Content-Disposition'} = "attachment";
 }
 elsif (!RT->Config->Get('TrustHTMLAttachments')) {
-    $content_type = 'text/plain' if ($content_type =~ /^text\/html/i);
+    $content_type = 'text/plain; charset=utf-8' if ($content_type =~ /^text\/html/i);
 }
 
 $r->content_type( $content_type );
-- 
cgit v1.2.1