diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2015-07-09 22:32:26 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2015-07-09 22:32:26 -0700 |
| commit | 026dc7ad72ba972f230b6709e31fa64397d75ad4 (patch) | |
| tree | c5af1a7ac9154744afc3660e9a9405892f2bb50b /rt/share/html/Download/CustomFieldValue/dhandler | |
| parent | 07b4bc84d1078f7390221d766cdb3142513db4b0 (diff) | |
| parent | 1c538bfabc2cd31f27067505f0c3d1a46cba6ef0 (diff) | |
merge RT 4.2.11 and Header changes to disable RT javascript, RT#34237
Diffstat (limited to 'rt/share/html/Download/CustomFieldValue/dhandler')
| -rw-r--r-- | rt/share/html/Download/CustomFieldValue/dhandler | 4 |
1 files changed, 2 insertions, 2 deletions
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 ); |