summaryrefslogtreecommitdiff
path: root/FS/FS/msg_template.pm
diff options
context:
space:
mode:
authormark <mark>2011-12-06 01:44:48 +0000
committermark <mark>2011-12-06 01:44:48 +0000
commit5957841fbf624c00f64cb25ebaa55a4dc8c9e36c (patch)
tree9e6915a38fbd26d308531dec246d1fa36af87085 /FS/FS/msg_template.pm
parent1fd786ff9c487e5458ad728a07de8bf952b1b315 (diff)
empty From address in default message templates, #15448
Diffstat (limited to 'FS/FS/msg_template.pm')
-rw-r--r--FS/FS/msg_template.pm3
1 files changed, 1 insertions, 2 deletions
diff --git a/FS/FS/msg_template.pm b/FS/FS/msg_template.pm
index 50efcdb..e47776c 100644
--- a/FS/FS/msg_template.pm
+++ b/FS/FS/msg_template.pm
@@ -652,8 +652,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',