diff options
Diffstat (limited to 'rt/lib/RT/Action/SendEmail.pm')
| -rwxr-xr-x | rt/lib/RT/Action/SendEmail.pm | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/rt/lib/RT/Action/SendEmail.pm b/rt/lib/RT/Action/SendEmail.pm index 349282230..9e93e4aab 100755 --- a/rt/lib/RT/Action/SendEmail.pm +++ b/rt/lib/RT/Action/SendEmail.pm @@ -931,8 +931,14 @@ sub SetSubject { return (); } - my $message = $self->TransactionObj->Attachments; + # don't use Transaction->Attachments because it caches + # and anything which later calls ->Attachments will be hurt + # by our RowsPerPage() call. caching is hard. + my $message = RT::Attachments->new( $self->CurrentUser ); + $message->Limit( FIELD => 'TransactionId', VALUE => $self->TransactionObj->id); + $message->OrderBy( FIELD => 'id', ORDER => 'ASC' ); $message->RowsPerPage(1); + if ( $self->{'Subject'} ) { $subject = $self->{'Subject'}; } elsif ( my $first = $message->First ) { @@ -1091,10 +1097,7 @@ sub MIMEEncodeString { return RT::Interface::Email::EncodeToMIME( String => $_[0], Charset => $_[1] ); } -eval "require RT::Action::SendEmail_Vendor"; -die $@ if ( $@ && $@ !~ qr{^Can't locate RT/Action/SendEmail_Vendor.pm} ); -eval "require RT::Action::SendEmail_Local"; -die $@ if ( $@ && $@ !~ qr{^Can't locate RT/Action/SendEmail_Local.pm} ); +RT::Base->_ImportOverlays(); 1; |