[freeside-commits] branch FREESIDE_4_BRANCH updated. 5f4d0e8ad92e9377d996ca7c709f528606f8a1db

[Mark Wells]

The branch, FREESIDE_4_BRANCH has been updated
       via  5f4d0e8ad92e9377d996ca7c709f528606f8a1db (commit)
      from  c1fa45998f0abdc3ed1b491d769e4204a4a260ec (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5f4d0e8ad92e9377d996ca7c709f528606f8a1db
Author: Mark Wells <mark at freeside.biz>
Date:   Tue May 3 13:49:22 2016 -0700

    fix fallback to invoice recipients, #33316

diff --git a/FS/FS/msg_template/email.pm b/FS/FS/msg_template/email.pm
index 47df4db..5abbaca 100644
--- a/FS/FS/msg_template/email.pm
+++ b/FS/FS/msg_template/email.pm
@@ -294,19 +294,14 @@ sub prepare {
 
   } elsif ( $cust_main ) {
 
-    if ( $opt{'to_contact_classnum'} ) {
-
-      my $classnum = $opt{'to_contact_classnum'};
-      my @classes = ref($classnum) ? @$classnum : split(',', $classnum);
-      if ( !@classes ) {
-        # traditional behavior: send to invoice email destinations (only)
-        @classes = ( 'invoice' );
-      }
-      @to = $cust_main->contact_list_email(@classes);
-      # not guaranteed to produce contacts, but then customers aren't
-      # guaranteed to have email addresses on file. in that case, env_to
-      # will be null and sending this message will fail.
-    }
+    my $classnum = $opt{'to_contact_classnum'} || '';
+    my @classes = ref($classnum) ? @$classnum : split(',', $classnum);
+    # traditional behavior: send to all invoice recipients
+    @classes = ('invoice') unless @classes;
+    @to = $cust_main->contact_list_email(@classes);
+    # not guaranteed to produce contacts, but then customers aren't
+    # guaranteed to have email addresses on file. in that case, env_to
+    # will be null and sending this message will fail.
 
   } else {
     die 'no To: address or cust_main object specified';

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

Summary of changes:
 FS/FS/msg_template/email.pm |   21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)