projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
60a758f
)
fix outgoing email with commas in company name, RT#76449
author
Ivan Kohler
<ivan@freeside.biz>
Fri, 30 Jun 2017 21:22:57 +0000
(14:22 -0700)
committer
Ivan Kohler
<ivan@freeside.biz>
Fri, 30 Jun 2017 21:22:57 +0000
(14:22 -0700)
FS/FS/Conf.pm
patch
|
blob
|
history
diff --git
a/FS/FS/Conf.pm
b/FS/FS/Conf.pm
index
5ba6fce
..
086448c
100644
(file)
--- a/
FS/FS/Conf.pm
+++ b/
FS/FS/Conf.pm
@@
-10,6
+10,7
@@
use IO::File;
use File::Basename;
use MIME::Base64;
use Locale::Currency;
use File::Basename;
use MIME::Base64;
use Locale::Currency;
+use Email::Address;
use FS::ConfItem;
use FS::ConfDefaults;
use FS::Locales;
use FS::ConfItem;
use FS::ConfDefaults;
use FS::Locales;
@@
-542,10
+543,11
@@
defined, company_name), appropriately combined based on their current values.
sub invoice_from_full {
my ($self, $agentnum) = @_;
sub invoice_from_full {
my ($self, $agentnum) = @_;
- ( $self->config('invoice_from_name', $agentnum)
- || $self->config('company_name', $agentnum)
- ).
- ' <'. $self->config('invoice_from', $agentnum ). '>';
+ my $name = $self->config('invoice_from_name', $agentnum)
+ || $self->config('company_name', $agentnum);
+
+ Email::Address->new( $name => $self->config('invoice_from', $agentnum ) )
+ ->format;
}
=back
}
=back