[Rt-commit] rt branch, 4.2/default-mail-precedence, created. rt-4.0.0rc6-167-g042c024

[Shawn Moore]

The branch, 4.2/default-mail-precedence has been created
        at  042c024f9fd8c21b063d024ebc4714da3e0ccf67 (commit)

- Log -----------------------------------------------------------------
commit 042c024f9fd8c21b063d024ebc4714da3e0ccf67
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Tue Mar 15 16:10:39 2011 -0400

    Move Predence defaulting closer to where we actually send email
    
        This way dashboards and digests get the default Precedence.
    
        #15260

diff --git a/lib/RT/Action/SendEmail.pm b/lib/RT/Action/SendEmail.pm
index 1559a07..5cfa8e9 100644
--- a/lib/RT/Action/SendEmail.pm
+++ b/lib/RT/Action/SendEmail.pm
@@ -608,12 +608,6 @@ sub SetRTSpecialHeaders {
         }
     }
 
-    if (my $precedence = RT->Config->Get('DefaultMailPrecedence')
-        and !$self->TemplateObj->MIMEObj->head->get("Precedence")
-    ) {
-        $self->SetHeader( 'Precedence', $precedence );
-    }
-
     $self->SetHeader( 'X-RT-Loop-Prevention', RT->Config->Get('rtname') );
     $self->SetHeader( 'RT-Ticket',
         RT->Config->Get('rtname') . " #" . $self->TicketObj->id() );
diff --git a/lib/RT/Interface/Email.pm b/lib/RT/Interface/Email.pm
index 3561805..2dbb12a 100644
--- a/lib/RT/Interface/Email.pm
+++ b/lib/RT/Interface/Email.pm
@@ -358,6 +358,12 @@ sub SendEmail {
         return -1;
     }
 
+    if (my $precedence = RT->Config->Get('DefaultMailPrecedence')
+        and !$args{'Entity'}->head->get("Precedence")
+    ) {
+        $args{'Entity'}->head->set( 'Precedence', $precedence );
+    }
+
     if ( $TransactionObj && !$TicketObj
         && $TransactionObj->ObjectType eq 'RT::Ticket' )
     {

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