[freeside-commits] branch FREESIDE_4_BRANCH updated. 79a7bf5a7dc369181849e4a0771b0c4d2d722d1c
Ivan
ivan at 420.am
Fri Jun 30 14:23:04 PDT 2017
The branch, FREESIDE_4_BRANCH has been updated
via 79a7bf5a7dc369181849e4a0771b0c4d2d722d1c (commit)
from e467098604e3d6038d666214bc1a3f5d2a6f44eb (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 79a7bf5a7dc369181849e4a0771b0c4d2d722d1c
Author: Ivan Kohler <ivan at freeside.biz>
Date: Fri Jun 30 14:23:02 2017 -0700
fix outgoing email with commas in company name, RT#76449
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 639a9ec..b58069f 100644
--- 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 Email::Address;
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) = @_;
- ( $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
-----------------------------------------------------------------------
Summary of changes:
FS/FS/Conf.pm | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
More information about the freeside-commits
mailing list