X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FDownload%2FCustomFieldValue%2Fdhandler;h=a31304888148614c694d41bf45a9a37d4856caac;hb=9ce482da3960ee43decee41fba53b78c12c3e52c;hp=6db45ed880d6f108955d15bc4b2ebaf8a4e91486;hpb=43a06151e47d2c59b833cbd8c26d97865ee850b6;p=freeside.git

diff --git a/rt/share/html/Download/CustomFieldValue/dhandler b/rt/share/html/Download/CustomFieldValue/dhandler
index 6db45ed88..a31304888 100644
--- a/rt/share/html/Download/CustomFieldValue/dhandler
+++ b/rt/share/html/Download/CustomFieldValue/dhandler
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -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; filename=" . $OCFV->Content;
+    $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 );