rt 4.2.14 (#13852)

[freeside.git] / rt / share / html / REST / 1.0 / Forms / attachment / default

diff --git a/rt/share/html/REST/1.0/Forms/attachment/default b/rt/share/html/REST/1.0/Forms/attachment/default
index b53f6fd..b5a0bd1 100644 (file)
--- a/rt/share/html/REST/1.0/Forms/attachment/default
+++ b/rt/share/html/REST/1.0/Forms/attachment/default
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2017 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -54,7 +54,7 @@ $args => undef
 <%INIT>
 my @data;
 my ($c, $o, $k, $e) = ("", [], {}, "");
-my $attachment = new RT::Attachment $session{CurrentUser};
+my $attachment = RT::Attachment->new($session{CurrentUser});
 
 $attachment->Load($id);
 unless ( $attachment->Id ) {
@@ -67,8 +67,10 @@ unless ( $attachment->Id eq $id ) {
 my @arglist = split( '/', $args || "" );
 my $content;
 
-if ( @argslist and $arglist[0] eq 'content' ) {
+if ( @arglist and $arglist[0] eq 'content' ) {
     $c = $attachment->OriginalContent;
+    $r->content_type($attachment->ContentType)
+        if $attachment->ContentType !~ /^text\//;
 } else {
     my @data;
     push @data, [ id              => "attachment/" . $attachment->Id ];