Merge branch 'master' of git.freeside.biz:/home/git/freeside

Conflicts:
	FS/FS/cust_main.pm

2 files changed, 8 insertions, 4 deletions

diff --git a/rt/share/html/Ticket/Elements/Customers b/rt/share/html/Ticket/Elements/Customers
index d90ef1c44..fed678380 100644
--- a/rt/share/html/Ticket/Elements/Customers
+++ b/rt/share/html/Ticket/Elements/Customers
@@ -43,10 +43,12 @@ while (my $link = $customers->Next) {
   } elsif ( $uri =~ /cust_svc\/(\d+)/ ) {
     my $svc = $link->TargetURI->Resolver;
     my $cust = $svc->CustomerResolver;
-    my $custnum = $cust->{fspkey};
-    $cust_main{$custnum} ||= $cust;
-    $cust_svc{$custnum} ||= [];
-    push @{$cust_svc{$custnum}}, $svc;
+    if ( $cust ) {
+      my $custnum = $cust->{fspkey};
+      $cust_main{$custnum} ||= $cust if $cust;
+      $cust_svc{$custnum} ||= [];
+      push @{$cust_svc{$custnum}}, $svc if $svc;
+    }
   }
 }
 @custnums = sort { $a <=> $b } keys %cust_main;
diff --git a/rt/share/html/Ticket/Update.html b/rt/share/html/Ticket/Update.html
index 26a37e80a..8a3d8e30d 100755
--- a/rt/share/html/Ticket/Update.html
+++ b/rt/share/html/Ticket/Update.html
@@ -290,6 +290,7 @@ if ( $ARGS{'SubmitTicket'} ) {
 
     my %squelched = ProcessTransactionSquelching( \%ARGS );
     $ARGS{'SquelchMailTo'} = [keys %squelched] if keys %squelched;
+warn @{ $ARGS{'SquelchMailTo'} } if $ARGS{'SquelchMailTo'};
 
     my $CFs = $TicketObj->TransactionCustomFields;
     my $ValidCFs = $m->comp(
@@ -311,6 +312,7 @@ if ( $ARGS{'SubmitTicket'} ) {
     );
     $checks_failure = 1 unless $status;
 }
+warn @{ $ARGS{'SquelchMailTo'} } if $ARGS{'SquelchMailTo'};
 
 # check email addresses for RT's
 {