diff options
Diffstat (limited to 'main/rt4/0001-email-allow-envelope-from-overriding-from-templates.patch')
| -rw-r--r-- | main/rt4/0001-email-allow-envelope-from-overriding-from-templates.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/rt4/0001-email-allow-envelope-from-overriding-from-templates.patch b/main/rt4/0001-email-allow-envelope-from-overriding-from-templates.patch index a7bbf33d9b..6168df1bcb 100644 --- a/main/rt4/0001-email-allow-envelope-from-overriding-from-templates.patch +++ b/main/rt4/0001-email-allow-envelope-from-overriding-from-templates.patch @@ -26,9 +26,9 @@ index 620ca60..8bd94eb 100644 unless ( $args{'Entity'}->head->get('To') || $args{'Entity'}->head->get('Cc') @@ -408,16 +411,16 @@ sub SendEmail { - - # SetOutgoingMailFrom - if ( RT->Config->Get('SetOutgoingMailFrom') ) { + if ( $args{'Bounce'} ) { + $args .= ' '. RT->Config->Get('SendmailBounceArguments'); + } elsif ( RT->Config->Get('SetOutgoingMailFrom') ) { - my $OutgoingMailAddress; + my $OutgoingMailAddress = $envelope_from; |