diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2012-02-03 10:45:25 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2012-02-03 10:52:40 +0200 |
| commit | d6866c4b19190d319cdf71d84dbeaa1144f60885 (patch) | |
| tree | e46e35a6a50d8c46ba53d71bd9f88f56c411900a /main/rt4/0001-email-allow-envelope-from-overriding-from-templates.patch | |
| parent | 631cd76a08a90fe22ccf064ee1cb38c73db482d7 (diff) | |
| download | aports-d6866c4b19190d319cdf71d84dbeaa1144f60885.tar.bz2 aports-d6866c4b19190d319cdf71d84dbeaa1144f60885.tar.xz | |
main/rt4: upgrade to 4.0.5 and use system droid fonts
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; |