[freeside-commits] branch master updated. 7e4a6981a48ce6ac8dd212799f4d7e342b7db64b

[Ivan]

The branch, master has been updated
       via  7e4a6981a48ce6ac8dd212799f4d7e342b7db64b (commit)
       via  2bf78c35f323700c1daa3808dccab351c3fe5b14 (commit)
      from  2bad20089a292ab4e9e80e8534aaec41b4bd7b2c (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 7e4a6981a48ce6ac8dd212799f4d7e342b7db64b
Merge: 2bf78c3 2bad200
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Dec 13 12:40:15 2016 -0800

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


commit 2bf78c35f323700c1daa3808dccab351c3fe5b14
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Dec 13 12:39:50 2016 -0800

    Revert "Format email addresses w/Email::Address instead of ad-hoc, fixes issues emailing companies with commas, RT#73241"
    
    This reverts commit 145bc8c83c8a132e5cd171a34b0f45948674d535.

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 51bde33..ec5f4ff 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -20,17 +20,16 @@ use base qw( FS::cust_main::Packages
 require 5.006;
 use strict;
 use Carp;
-use Try::Tiny;
 use Scalar::Util qw( blessed );
-use List::Util qw(min);
-use Tie::IxHash;
-use File::Temp; #qw( tempfile );
-use Data::Dumper;
 use Time::Local qw(timelocal);
+use Data::Dumper;
+use Tie::IxHash;
 use Date::Format;
 #use Date::Manip;
-use Email::Address;
+use File::Temp; #qw( tempfile );
 use Business::CreditCard 0.28;
+use List::Util qw(min);
+use Try::Tiny;
 use FS::UID qw( dbh driver_name );
 use FS::Record qw( qsearchs qsearch dbdef regexp_sql );
 use FS::Cursor;
@@ -3061,9 +3060,8 @@ sub contact_list_email {
   my @emails;
   foreach my $contact (@contacts) {
     foreach my $contact_email ($contact->contact_email) {
-      push @emails,  Email::Address->new( $contact->firstlast,
-                                          $contact_email->emailaddress
-                     )->format;
+      push @emails,
+        $contact->firstlast . ' <' . $contact_email->emailaddress . '>';
     }
   }
   @emails;

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

Summary of changes:
 FS/FS/cust_main.pm |   16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)