summaryrefslogtreecommitdiff
path: root/FS
diff options
context:
space:
mode:
authormark <mark>2011-12-06 01:45:12 +0000
committermark <mark>2011-12-06 01:45:12 +0000
commit167480801f938b021e2b06113cf9284bd3b6895b (patch)
treece8ccd9379a782768e08fba533766e296369c428 /FS
parentcea0953f9c7b0d21843ae058e57a5d0d86098367 (diff)
empty From address in default message templates, #15448
Diffstat (limited to 'FS')
-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 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',