[Rt-commit] rt branch, 4.0/allow-template-to-set-originator, created. rt-4.0.22-14-gb408e9b

[? sunnavy]

The branch, 4.0/allow-template-to-set-originator has been created
        at  b408e9ba413a22f598cdaeaaed5607a33ed784fc (commit)

- Log -----------------------------------------------------------------
commit b408e9ba413a22f598cdaeaaed5607a33ed784fc
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Fri Oct 10 02:04:55 2014 +0800

    don't bother setting RT-Originator if it's defined already
    
    thus admin can easily customize it in templates

diff --git a/lib/RT/Action/SendEmail.pm b/lib/RT/Action/SendEmail.pm
index 3613a88..8fa99e6 100644
--- a/lib/RT/Action/SendEmail.pm
+++ b/lib/RT/Action/SendEmail.pm
@@ -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 );

-----------------------------------------------------------------------