[Rt-commit] rt branch, 3.8-trunk, updated. rt-3.8.7-109-g6c7085a

[Kevin Falcone]

The branch, 3.8-trunk has been updated
       via  6c7085a09b1fe175ae84f504b698e6b69941f63d (commit)
      from  08f4e1825d52f25a179ba12a9582244fb927493b (commit)

Summary of changes:
 lib/RT/Interface/Web.pm |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit 6c7085a09b1fe175ae84f504b698e6b69941f63d
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Thu Jan 14 15:47:02 2010 -0500

    Handle Ccs and AdminCcs of the queue, as well as those specified on
    the ticket itself

diff --git a/lib/RT/Interface/Web.pm b/lib/RT/Interface/Web.pm
index c66e204..4e6bd1a 100755
--- a/lib/RT/Interface/Web.pm
+++ b/lib/RT/Interface/Web.pm
@@ -1129,13 +1129,17 @@ sub ProcessUpdateMessage {
     );
 
     my @temp_squelch;
-    foreach my $type (qw(Requestor Cc AdminCc)) {
+    foreach my $type (qw(Cc AdminCc)) {
         if (grep $_ eq $type || $_ eq ( $type . 's' ), @{ $args{ARGSRef}->{'SkipNotification'} || [] }) {
             push @temp_squelch, map $_->address, Email::Address->parse( $message_args{$type} );
-            my $watcher_method = $type eq 'Requestor' ? 'Requestors' : $type; # method consistency fail
-            push @temp_squelch, $args{TicketObj}->$watcher_method->MemberEmailAddresses;
+            push @temp_squelch, $args{TicketObj}->$type->MemberEmailAddresses;
+            push @temp_squelch, $args{TicketObj}->QueueObj->$type->MemberEmailAddresses;
         }
     }
+    if (grep $_ eq 'Requestor' || $_ eq 'Requestors', @{ $args{ARGSRef}->{'SkipNotification'} || [] }) {
+            push @temp_squelch, map $_->address, Email::Address->parse( $message_args{Requestor} );
+            push @temp_squelch, $args{TicketObj}->Requestors->MemberEmailAddresses;
+    }
 
     if (@temp_squelch) {
         require RT::Action::SendEmail;

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