[Rt-commit] rt branch, 3.8-trunk, updated. rt-3.8.6-82-g9265075

[sartak at bestpractical.com]

The branch, 3.8-trunk has been updated
       via  9265075b4a4721ff85b71fb58147e65ece92d90d (commit)
       via  92a31983f4118638f3d93613b73a2e8308381de6 (commit)
      from  17f46e8a81158500003451964240670d819e5e54 (commit)

Summary of changes:
 etc/RT_Config.pm.in       |    4 ++++
 lib/RT/Interface/Email.pm |    8 +++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit 92a31983f4118638f3d93613b73a2e8308381de6
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Fri Nov 6 15:56:25 2009 -0500

    Document the Default key

diff --git a/etc/RT_Config.pm.in b/etc/RT_Config.pm.in
index 3481f94..8f06b93 100755
--- a/etc/RT_Config.pm.in
+++ b/etc/RT_Config.pm.in
@@ -390,9 +390,13 @@ C<$OverrideOutgoingMailFrom> is used for overwriting the Correspond
 address of the queue. The option is a hash reference of queue name to
 email address.
 
+If there is no ticket involved, then the value of the C<Default> key will be
+used.
+
 =cut
 
 Set($OverrideOutgoingMailFrom, {
+#    'Default' => 'admin at rt.example.com',
 #    'General' => 'general at rt.example.com',
 });
 

commit 9265075b4a4721ff85b71fb58147e65ece92d90d
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Fri Nov 6 15:58:15 2009 -0500

    Clean up some double-negative logic

diff --git a/lib/RT/Interface/Email.pm b/lib/RT/Interface/Email.pm
index 97fe2a8..2cae7a4 100755
--- a/lib/RT/Interface/Email.pm
+++ b/lib/RT/Interface/Email.pm
@@ -397,10 +397,12 @@ sub SendEmail {
 
         if ($TicketObj) {
             my $QueueName = $TicketObj->QueueObj->Name;
-            if (not defined RT->Config->Get('OverrideOutgoingMailFrom')->{$QueueName}) {
-                $OutgoingMailAddress = $TicketObj->QueueObj->CorrespondAddress;
+            my $QueueAddressOverride = RT->Config->Get('OverrideOutgoingMailFrom')->{$QueueName};
+
+            if ($QueueAddressOverride) {
+                $OutgoingMailAddress = $QueueAddressOverride;
             } else {
-                $OutgoingMailAddress = RT->Config->Get('OverrideOutgoingMailFrom')->{$QueueName};
+                $OutgoingMailAddress = $TicketObj->QueueObj->CorrespondAddress;
             }
         }
 

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