X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FMailer.pm;h=b7932457b938cf5be583f4959b65236ea9427a89;hb=28550377f37c6bb63c86cb1460b233b042b29dfc;hp=52a7d74695aae42024607eb1177baff8d773e1cb;hpb=117332fcc34457aadb85db18dbc42f48d32b732e;p=kivitendo-erp.git

diff --git a/SL/Mailer.pm b/SL/Mailer.pm
index 52a7d7469..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 {
@@ -225,7 +226,7 @@ sub send {
     $self->_store_in_journal('failed', 'driver could not be created; check your configuration & log files');
     $::lxdebug->message(LXDebug::WARN(), "Mailer error during 'send': $error");
 
-    return "send email : $error";
+    return $error;
   }
 
   # Set defaults & 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;
@@ -264,7 +265,7 @@ sub send {
 
   $self->{journalentry} = $self->_store_in_journal;
 
-  return $ok ? '' : "send email: $error";
+  return $ok ? '' : ($error || "undefined error");
 }
 
 sub _all_recipients {