diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2015-08-07 22:01:31 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2015-08-07 22:01:31 -0700 |
| commit | 0c76afbb717e1716e6126bc4a120b8d9471614a0 (patch) | |
| tree | 9a398e455a7767372588077470685d25ef8d82b3 /rt/lib/RT/Action/SendEmail.pm | |
| parent | 7beec7068e00be5ae1b2599fdf2b494bc19e31d0 (diff) | |
| parent | 3e2c2ad8aff1bd361ca07495b2255538c8231079 (diff) | |
Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE_3_BRANCH
Diffstat (limited to 'rt/lib/RT/Action/SendEmail.pm')
| -rwxr-xr-x | rt/lib/RT/Action/SendEmail.pm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/rt/lib/RT/Action/SendEmail.pm b/rt/lib/RT/Action/SendEmail.pm index a483fba9f..af3a6bf8a 100755 --- a/rt/lib/RT/Action/SendEmail.pm +++ b/rt/lib/RT/Action/SendEmail.pm @@ -2,7 +2,7 @@ # # COPYRIGHT: # -# This software is Copyright (c) 1996-2014 Best Practical Solutions, LLC +# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC # <sales@bestpractical.com> # # (Except where explicitly superseded by other copyright notices) @@ -616,6 +616,7 @@ sub SetRTSpecialHeaders { # XXX, TODO: use /ShowUser/ShowUserEntry(or something like that) when it would be # refactored into user's method. if ( my $email = $self->TransactionObj->CreatorObj->EmailAddress + and ! defined $self->TemplateObj->MIMEObj->head->get("RT-Originator") and RT->Config->Get('UseOriginatorHeader') ) { $self->SetHeader( 'RT-Originator', $email ); |