diff options
| author | Jonathan Prykop <jonathan@freeside.biz> | 2015-01-29 18:00:36 -0600 |
|---|---|---|
| committer | Jonathan Prykop <jonathan@freeside.biz> | 2015-01-29 18:00:36 -0600 |
| commit | 8f695e657e4f97cbf9ebbf99c3c2dd24bb9aea2f (patch) | |
| tree | 94f06b305ea4387bc9c8b454452d143c0d2a00de /FS/FS/Cron | |
| parent | fbdaf36fb33a44a453e23bc2dc8d18637b40dae9 (diff) | |
RT#30613: Can't Send E-mail
Diffstat (limited to 'FS/FS/Cron')
| -rw-r--r-- | FS/FS/Cron/agent_email.pm | 5 | ||||
| -rw-r--r-- | FS/FS/Cron/upload.pm | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/FS/FS/Cron/agent_email.pm b/FS/FS/Cron/agent_email.pm index 623b920..6bc1cc6 100644 --- a/FS/FS/Cron/agent_email.pm +++ b/FS/FS/Cron/agent_email.pm @@ -29,10 +29,7 @@ sub agent_email { RT::ConnectToDatabase(); } - my $from = $conf->config('invoice_from_name') ? - $conf->config('invoice_from_name') . ' <' . - $conf->config('invoice_from') . '>' : - $conf->config('invoice_from'); + my $from = $conf->invoice_from_full(); my $outbuf = '';; my( $fs_interp, $rt_interp ) = mason_interps('standalone', 'outbuf'=>\$outbuf); diff --git a/FS/FS/Cron/upload.pm b/FS/FS/Cron/upload.pm index fa1762f..6a4d153 100644 --- a/FS/FS/Cron/upload.pm +++ b/FS/FS/Cron/upload.pm @@ -508,10 +508,7 @@ sub prepare_report { ( to => $to, - from => $conf->config('invoice_from_name', $agentnum) ? - $conf->config('invoice_from_name', $agentnum) . ' <' . - $conf->config('invoice_from', $agentnum) . '>' : - $conf->config('invoice_from', $agentnum), + from => $conf->invoice_from_full($agentnum), subject => $subject, body => $body, ); |