X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fupload_target.pm;h=af2dcb13446e5b8412d99c7953e0917ff7c1439d;hp=73d2a04c3ab14a52a88f7bab54599ee0ad80c2f8;hb=3adb46fccf9f631e188ea5383bd147b340477639;hpb=f13c9d8580d02851b150e21ea9beb6fc1dfbd3c8

diff --git a/FS/FS/upload_target.pm b/FS/FS/upload_target.pm
index 73d2a04c3..af2dcb134 100644
--- 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,