diff options
| author | Kory Prince <korylprince@gmail.com> | 2018-03-26 09:17:37 -0500 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2018-04-02 14:19:27 +0000 |
| commit | 9f80be0770ff7f3e644916d66abc1175d0265349 (patch) | |
| tree | 7c79ccda3ffe8bb73eb1f54de0cc7893e51dcb0a /community/rt4/0001-email-allow-envelope-from-overriding-from-templates.patch | |
| parent | 8827ab5d758362a00f25e71caadfcbc00859c0ef (diff) | |
| download | aports-9f80be0770ff7f3e644916d66abc1175d0265349.tar.bz2 aports-9f80be0770ff7f3e644916d66abc1175d0265349.tar.xz | |
community/rt4: quiet chomp warnings
Diffstat (limited to 'community/rt4/0001-email-allow-envelope-from-overriding-from-templates.patch')
| -rw-r--r-- | community/rt4/0001-email-allow-envelope-from-overriding-from-templates.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/community/rt4/0001-email-allow-envelope-from-overriding-from-templates.patch b/community/rt4/0001-email-allow-envelope-from-overriding-from-templates.patch index ae48036cc5..32b55b3082 100644 --- a/community/rt4/0001-email-allow-envelope-from-overriding-from-templates.patch +++ b/community/rt4/0001-email-allow-envelope-from-overriding-from-templates.patch @@ -1,4 +1,4 @@ -From 0fa9baf1004fb02a370cc78c1586f3207b1712b8 Mon Sep 17 00:00:00 2001 +From 16205e84a3b6de87dbe46a03174c2d75f1d1d544 Mon Sep 17 00:00:00 2001 From: Kory Prince <korylprince@gmail.com> Date: Thu, 22 Mar 2018 13:00:02 -0500 Subject: [PATCH] email: allow envelope from overriding from templates @@ -10,7 +10,7 @@ from if using sendmailpipe mail sending. 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/lib/RT/Interface/Email.pm b/lib/RT/Interface/Email.pm -index 7466c0f78..b90bc1a73 100644 +index 7466c0f78..04a88554c 100644 --- a/lib/RT/Interface/Email.pm +++ b/lib/RT/Interface/Email.pm @@ -740,7 +740,14 @@ sub MailError { @@ -46,7 +46,7 @@ index 7466c0f78..b90bc1a73 100644 my $msgid = Encode::decode( "UTF-8", $args{'Entity'}->head->get('Message-ID') || '' ); chomp $msgid; + -+ my $envelope_from = $args{'Entity'}->head->get('X-RT-Envelope-From'); ++ my $envelope_from = $args{'Entity'}->head->get('X-RT-Envelope-From') || ''; + chomp $envelope_from; # If we don't have any recipients to send to, don't send a message; |