projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3d7fbe3
)
Revert "Format email addresses w/Email::Address instead of ad-hoc, fixes issues email...
author
Ivan Kohler
<ivan@freeside.biz>
Tue, 13 Dec 2016 20:39:50 +0000
(12:39 -0800)
committer
Ivan Kohler
<ivan@freeside.biz>
Tue, 13 Dec 2016 20:43:49 +0000
(12:43 -0800)
This reverts commit
bf6d06efe903dfd4c112fb9eccb98344841b729c
.
FS/FS/cust_main.pm
patch
|
blob
|
history
diff --git
a/FS/FS/cust_main.pm
b/FS/FS/cust_main.pm
index
0165bc4
..
7e1a25d
100644
(file)
--- a/
FS/FS/cust_main.pm
+++ b/
FS/FS/cust_main.pm
@@
-32,7
+32,6
@@
use Digest::MD5 qw(md5_base64);
use Date::Format;
#use Date::Manip;
use File::Temp; #qw( tempfile );
use Date::Format;
#use Date::Manip;
use File::Temp; #qw( tempfile );
-use Email::Address;
use Business::CreditCard 0.28;
use FS::UID qw( getotaker dbh driver_name );
use FS::Record qw( qsearchs qsearch dbdef regexp_sql );
use Business::CreditCard 0.28;
use FS::UID qw( getotaker dbh driver_name );
use FS::Record qw( qsearchs qsearch dbdef regexp_sql );
@@
-3572,17
+3571,15
@@
sub contact_list_email {
# unlike on 4.x, we have a separate list of invoice email
# destinations.
# make sure they're not redundant with contact emails
# unlike on 4.x, we have a separate list of invoice email
# destinations.
# make sure they're not redundant with contact emails
- $emails{ $contact_email->emailaddress } =
- Email::Address->new( $contact->firstlast,
- $contact_email->emailaddress
- )->format;
+ my $dest = $contact->firstlast . ' <' . $contact_email->emailaddress . '>';
+ $emails{ $contact_email->emailaddress } = $dest;
}
}
}
if ( $and_invoice ) {
foreach my $email ($self->invoicing_list_emailonly) {
}
}
}
if ( $and_invoice ) {
foreach my $email ($self->invoicing_list_emailonly) {
- $emails{ $email } ||=
-
Email::Address->new( $self->name_short, $email )->forma
t;
+ my $dest = $self->name_short . ' <' . $email . '>';
+
$emails{ $email } ||= $des
t;
}
}
values %emails;
}
}
values %emails;