summaryrefslogtreecommitdiff
path: root/rt/lib/RT/Action/SendEmail.pm
diff options
context:
space:
mode:
Diffstat (limited to 'rt/lib/RT/Action/SendEmail.pm')
-rwxr-xr-xrt/lib/RT/Action/SendEmail.pm10
1 files changed, 5 insertions, 5 deletions
diff --git a/rt/lib/RT/Action/SendEmail.pm b/rt/lib/RT/Action/SendEmail.pm
index 3c70dc401..431b97c75 100755
--- a/rt/lib/RT/Action/SendEmail.pm
+++ b/rt/lib/RT/Action/SendEmail.pm
@@ -253,9 +253,9 @@ sub SendMessage {
if ( $RT::MailCommand eq 'sendmailpipe' ) {
eval {
- open( MAIL, "|$RT::SendmailPath $RT::SendmailArguments" ) || die $!;
- print MAIL $MIMEObj->as_string;
- close(MAIL);
+ open( my $mail, "|$RT::SendmailPath $RT::SendmailArguments" ) || die $!;
+ $MIMEObj->print($mail);
+ close($mail);
};
if ($@) {
$RT::Logger->crit( $msgid . "Could not send mail. -" . $@ );
@@ -323,7 +323,7 @@ sub AddAttachments {
FIELD => 'TransactionId',
VALUE => $self->TransactionObj->Id
);
- $attachments->OrderBy('id');
+ $attachments->OrderBy( FIELD => 'id');
my $transaction_content_obj = $self->TransactionObj->ContentObj;
@@ -445,7 +445,7 @@ sub SetRTSpecialHeaders {
# If there is one, and we can parse it, then base our Message-ID on it
if ($msgid
- and $msgid =~ s/<(rt-.*?-\d+-\d+)\.(\d+-0-0)\@$RT::Organization>$/
+ and $msgid =~ s/<(rt-.*?-\d+-\d+)\.(\d+)-\d+-\d+\@\Q$RT::Organization\E>$/
"<$1." . $self->TicketObj->id
. "-" . $self->ScripObj->id
. "-" . $self->ScripActionObj->{_Message_ID}