This commit was generated by cvs2svn to compensate for changes in r4407,

which included commits to RCS files with non-trunk default branches.

1 files changed, 10 insertions, 4 deletions

diff --git a/rt/html/Ticket/Elements/LoadTextAttachments b/rt/html/Ticket/Elements/LoadTextAttachments
index 370371b5a..943568fb3 100755
--- a/rt/html/Ticket/Elements/LoadTextAttachments
+++ b/rt/html/Ticket/Elements/LoadTextAttachments
@@ -1,8 +1,8 @@
-%# {{{ BEGIN BPS TAGGED BLOCK
+%# BEGIN BPS TAGGED BLOCK {{{
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# }}} END BPS TAGGED BLOCK
+%# END BPS TAGGED BLOCK }}}
 <%INIT>
 
 my $attachments = RT::Attachments->new( $session{'CurrentUser'} );
@@ -58,11 +58,17 @@ if ( $Ticket->CurrentUserHasRight('ShowTicket') ) {
     
     my $tickets = $attachments->NewAlias('Tickets');
 
+
     $attachments->Join( ALIAS1 => $transactions,
-                        FIELD1 => 'Ticket',
+                        FIELD1 => 'ObjectId',
                         ALIAS2 => $tickets,
                         FIELD2 => 'id' );
 
+    $attachments->Limit( ALIAS => $transactions,
+                         FIELD => 'ObjectType',
+                        VALUE => 'RT::Ticket');
+
+
     $attachments->Limit( ALIAS => $tickets,
                          FIELD => 'EffectiveId',
                          VALUE => $Ticket->id() );