From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 30 Jun 2017 21:23:06 +0000 (-0700)
Subject: fix outgoing email with commas in company name, RT#76449
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=76efbc5d717233b0cd55130c9938d43b2398dc5c

fix outgoing email with commas in company name, RT#76449
---

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 07042e5fd..1fe11a0e3 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -9,6 +9,7 @@ use Carp;
 use IO::File;
 use File::Basename;
 use MIME::Base64;
+use Email::Address;
 use FS::ConfItem;
 use FS::ConfDefaults;
 use FS::Conf_compat17;
@@ -605,10 +606,12 @@ based on their current values.
 
 sub invoice_from_full {
   my ($self, $agentnum) = @_;
-  return $self->config('invoice_from_name', $agentnum ) ?
-         $self->config('invoice_from_name', $agentnum ) . ' <' .
-         $self->config('invoice_from', $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