eliminate some false laziness in FS::Misc::send_email vs. msg_template/email.pm send_...

[freeside.git] / FS / FS / upload_target.pm

diff --git a/FS/FS/upload_target.pm b/FS/FS/upload_target.pm
index 73d2a04..af2dcb1 100644 (file)
--- a/FS/FS/upload_target.pm
+++ b/FS/FS/upload_target.pm
@@ -163,10 +163,7 @@ 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_name') ?
-                         $conf->config('invoice_from_name') . ' <' .
-                         $conf->config('invoice_from') . '>' :
-                         $conf->config('invoice_from'),
+      'from'          => $conf->invoice_from_full(),
       'to'            => $to,
       'subject'       => $self->subject,
       'nobody'        => 1,