[Rt-commit] rt branch, 3.8-trunk, updated. rt-3.8.7-162-g15ec7b4

[Ruslan Zakirov]

The branch, 3.8-trunk has been updated
       via  15ec7b4d900ecfe235f4a67e352fc5914715dabc (commit)
      from  d8ca52cc5cf11a1b4ceda3f05c0ca6f258ded27f (commit)

Summary of changes:
 lib/RT/Action/SendEmail.pm |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit 15ec7b4d900ecfe235f4a67e352fc5914715dabc
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Thu Feb 18 05:09:50 2010 +0300

    DefaultMailPrecedence config option worked incorrectly
    
    "if !x || !y" when it should be "if !x && y"

diff --git a/lib/RT/Action/SendEmail.pm b/lib/RT/Action/SendEmail.pm
index 56d00b4..850abb3 100755
--- a/lib/RT/Action/SendEmail.pm
+++ b/lib/RT/Action/SendEmail.pm
@@ -607,9 +607,11 @@ sub SetRTSpecialHeaders {
         }
     }
 
-    $self->SetHeader( 'Precedence', RT->Config->Get('DefaultMailPrecedence') )
-        unless $self->TemplateObj->MIMEObj->head->get("Precedence")
-            && defined(RT->Config->Get('DefaultMailPrecedence'));
+    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',

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