[freeside-commits] freeside/FS/FS msg_template.pm, 1.21.2.2, 1.21.2.3

[Mark Wells]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv4993/FS/FS

Modified Files:
      Tag: FREESIDE_2_3_BRANCH
	msg_template.pm 
Log Message:
empty From address in default message templates, #15448

Index: msg_template.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/msg_template.pm,v
retrieving revision 1.21.2.2
retrieving revision 1.21.2.3
diff -u -w -d -r1.21.2.2 -r1.21.2.3
--- msg_template.pm	30 Oct 2011 23:28:25 -0000	1.21.2.2
+++ msg_template.pm	6 Dec 2011 01:45:12 -0000	1.21.2.3
@@ -635,8 +635,7 @@
         my $new = new FS::msg_template({
           'msgname'   => $oldname,
           'agentnum'  => $agentnum,
-          'from_addr' => ($from && $conf->config($from, $agentnum)) || 
-                         $conf->config('invoice_from', $agentnum),
+          'from_addr' => ($from && $conf->config($from, $agentnum)) || '',
           'bcc_addr'  => ($bcc && $conf->config($from, $agentnum)) || '',
           'subject'   => ($subject && $conf->config($subject, $agentnum)) || '',
           'mime_type' => 'text/html',