projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge RT 4.2.11 and Header changes to disable RT javascript, RT#34237
[freeside.git]
/
rt
/
share
/
html
/
Download
/
CustomFieldValue
/
dhandler
diff --git
a/rt/share/html/Download/CustomFieldValue/dhandler
b/rt/share/html/Download/CustomFieldValue/dhandler
index
6db45ed
..
aba6004
100644
(file)
--- a/
rt/share/html/Download/CustomFieldValue/dhandler
+++ b/
rt/share/html/Download/CustomFieldValue/dhandler
@@
-2,7
+2,7
@@
%#
%# COPYRIGHT:
%#
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-201
2
Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-201
5
Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
%# <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");
}
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')) {
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')) {
}
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 );
}
$r->content_type( $content_type );