summaryrefslogtreecommitdiff
path: root/FS/FS/upload_target.pm
diff options
context:
space:
mode:
authorJonathan Prykop <jonathan@freeside.biz>2015-01-27 16:25:18 -0600
committerJonathan Prykop <jonathan@freeside.biz>2015-01-27 16:25:18 -0600
commitf13c9d8580d02851b150e21ea9beb6fc1dfbd3c8 (patch)
tree0d3c6ad7f0e7a5dd3068d34fb90f996fc2aadd02 /FS/FS/upload_target.pm
parent412bc43b866761bbdf5db3833960ebe6db1cac18 (diff)
Ticket #30613: Can't Send E-mail
Diffstat (limited to 'FS/FS/upload_target.pm')
-rw-r--r--FS/FS/upload_target.pm5
1 files changed, 4 insertions, 1 deletions
diff --git a/FS/FS/upload_target.pm b/FS/FS/upload_target.pm
index 33088cb..73d2a04 100644
--- a/FS/FS/upload_target.pm
+++ b/FS/FS/upload_target.pm
@@ -163,7 +163,10 @@ sub put {
# (maybe use only the raw content, so that we don't have to supply a
# customer for substitutions? ewww.)
my %message = (
- 'from' => $conf->config('invoice_from'),
+ 'from' => $conf->config('invoice_from_name') ?
+ $conf->config('invoice_from_name') . ' <' .
+ $conf->config('invoice_from') . '>' :
+ $conf->config('invoice_from'),
'to' => $to,
'subject' => $self->subject,
'nobody' => 1,