X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FMailer.pm;h=b7932457b938cf5be583f4959b65236ea9427a89;hb=e713c3142d8c603b31d25fff371da47f56976aae;hp=87b3dfc86cc08778d3735d9ae349bed0c8559634;hpb=56ed2f3ab3714f8e5bf076920a0c52d8b2614984;p=kivitendo-erp.git diff --git a/SL/Mailer.pm b/SL/Mailer.pm index 87b3dfc86..b7932457b 100644 --- a/SL/Mailer.pm +++ b/SL/Mailer.pm @@ -34,6 +34,7 @@ use SL::DB::EmailJournal; use SL::DB::EmailJournalAttachment; use SL::DB::Employee; use SL::Template; +use SL::Version; use strict; @@ -87,7 +88,7 @@ sub _create_message_id { $domain =~ s/.*\@//; $domain =~ s/>.*//; - return "kivitendo-$self->{version}-" . time() . "-${$}-${num_sent}\@$domain"; + return "kivitendo-" . SL::Version->get_version . "-" . time() . "-${$}-${num_sent}\@$domain"; } sub _create_address_headers { @@ -234,7 +235,7 @@ sub send { $self->{headers} = [ Subject => $self->{subject}, 'Message-ID' => '<' . $self->_create_message_id . '>', - 'X-Mailer' => "kivitendo $self->{version}", + 'X-Mailer' => "kivitendo " . SL::Version->get_version, ]; $self->{mail_attachments} = []; $self->{content_by_name} = $::instance_conf->get_email_journal == 1 && $::instance_conf->get_doc_files;