X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FMailer.pm;h=6536850581a0b611669c39c8e5e697a5b1a799c1;hb=611491d9d96eb989d1455f87685e57bcaa8f7837;hp=dc6002b42eb6a12b8df9238427c0607f6e7d4941;hpb=8fec2dc1a8d85554b23c6333bac430d6004a6aed;p=kivitendo-erp.git

diff --git a/SL/Mailer.pm b/SL/Mailer.pm
index dc6002b42..653685058 100644
--- a/SL/Mailer.pm
+++ b/SL/Mailer.pm
@@ -236,12 +236,18 @@ sub _all_recipients {
 sub _store_in_journal {
   my ($self, $status, $extended_status) = @_;
 
+  my $journal_enable = $::instance_conf->get_email_journal;
+
+  return if $journal_enable == 0;
+
   $status          //= $self->{driver}->status if $self->{driver};
   $status          //= 'failed';
   $extended_status //= $self->{driver}->extended_status if $self->{driver};
   $extended_status //= 'unknown error';
 
-  my @attachments = grep { $_ } map {
+  my @attachments;
+
+  @attachments = grep { $_ } map {
     my $part = $self->_create_attachment_part($_);
     if ($part) {
       SL::DB::EmailJournalAttachment->new(
@@ -250,7 +256,7 @@ sub _store_in_journal {
         content   => $part->body,
       )
     }
-  } @{ $self->{attachments} || [] };
+  } @{ $self->{attachments} || [] } if $journal_enable > 1;
 
   my $headers = join "\r\n", (bundle_by { join(': ', @_) } 2, @{ $self->{headers} || [] });