From: mark <mark>
Date: Tue, 6 Dec 2011 01:45:12 +0000 (+0000)
Subject: empty From address in default message templates, #15448
X-Git-Tag: freeside_2_3_1~112
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=167480801f938b021e2b06113cf9284bd3b6895b;ds=sidebyside

empty From address in default message templates, #15448
---

diff --git a/FS/FS/msg_template.pm b/FS/FS/msg_template.pm
index 614c90fc2..1c458a090 100644
--- a/FS/FS/msg_template.pm
+++ b/FS/FS/msg_template.pm
@@ -635,8 +635,7 @@ sub _upgrade_data {
         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',