projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cea0953
)
empty From address in default message templates, #15448
author
mark
<mark>
Tue, 6 Dec 2011 01:45:12 +0000
(
01:45
+0000)
committer
mark
<mark>
Tue, 6 Dec 2011 01:45:12 +0000
(
01:45
+0000)
FS/FS/msg_template.pm
patch
|
blob
|
history
diff --git
a/FS/FS/msg_template.pm
b/FS/FS/msg_template.pm
index
614c90f
..
1c458a0
100644
(file)
--- 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,
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',
'bcc_addr' => ($bcc && $conf->config($from, $agentnum)) || '',
'subject' => ($subject && $conf->config($subject, $agentnum)) || '',
'mime_type' => 'text/html',