X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FForm.pm;h=5424a7c923cbd2e6812b59471d953208c058ddeb;hb=3f89fa90275e5df9b806ca4f8abe447af83a3362;hp=3969cbfef301a42e20fe23c066d8f86166e1982e;hpb=3d8c8e2fa8dc160248411314e135b21e92332201;p=kivitendo-erp.git diff --git a/SL/Form.pm b/SL/Form.pm index 3969cbfef..5424a7c92 100644 --- a/SL/Form.pm +++ b/SL/Form.pm @@ -1127,10 +1127,10 @@ sub parse_template { sub get_bcc_defaults { my ($self, $myconfig, $mybcc) = @_; -# if (SL::DB::Default->get->bcc_to_login) { -# $mybcc .= ", " if $mybcc; -# $mybcc .= $myconfig->{email}; -# } + if (SL::DB::Default->get->bcc_to_login) { + $mybcc .= ", " if $mybcc; + $mybcc .= $myconfig->{email}; + } my $otherbcc = SL::DB::Default->get->global_bcc; if ($otherbcc) { $mybcc .= ", " if $mybcc; @@ -1212,9 +1212,9 @@ sub send_email { } } foreach my $attfile ( @attfiles ) { - push @{ $mail->{attachments} }, { path => SL::File->get_file_path(dbfile => $attfile), + push @{ $mail->{attachments} }, { path => $attfile->get_file, id => $attfile->id, - type => $attfile->file_mime_type, + type => $attfile->mime_type, name => $attfile->file_name }; } }