diff options
| author | ivan <ivan> | 2008-03-02 04:11:51 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2008-03-02 04:11:51 +0000 |
| commit | 8103c1fc1b2c27a6855feadf26f91b980a54bc52 (patch) | |
| tree | 631dd45606c37c00d9026e14ecc3ee3700b4b51c /rt/html/REST/1.0/Forms/ticket/attachments | |
| parent | 9c68254528b6f2c7d8c1921b452fa56064783782 (diff) | |
import rt 3.6.6
Diffstat (limited to 'rt/html/REST/1.0/Forms/ticket/attachments')
| -rw-r--r-- | rt/html/REST/1.0/Forms/ticket/attachments | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/rt/html/REST/1.0/Forms/ticket/attachments b/rt/html/REST/1.0/Forms/ticket/attachments index ca75ce0..4ee409b 100644 --- a/rt/html/REST/1.0/Forms/ticket/attachments +++ b/rt/html/REST/1.0/Forms/ticket/attachments @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# <jesse@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ %# %# You should have received a copy of the GNU General Public License %# along with this program; if not, write to the Free Software -%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +%# 02110-1301 or visit their web page on the internet at +%# http://www.gnu.org/copyleft/gpl.html. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -49,7 +51,7 @@ $id $args => undef </%ARGS> -<%perl> +<%INIT> my @data; my ($c, $o, $k, $e) = ("", [], {}, ""); my $ticket = new RT::Ticket $session{CurrentUser}; @@ -80,7 +82,12 @@ if ($aid) { return [ "# Invalid attachment id: $aid", [], {}, 1 ]; } if ($content) { - $c = $attachment->OriginalContent; + $c = $attachment->OriginalContent; + # if we're sending a binary attachment (and only the attachment) + # flag it so bin/rt knows to special case it + if ($attachment->ContentType !~ /^text\//) { + $r->content_type($attachment->ContentType); + } } else { my @data; push @data, [ id => $attachment->Id ]; @@ -125,4 +132,4 @@ else { } return [ $c, $o, $k, $e ]; -</%perl> +</%INIT> |