From b161d667d1831bff8111fcec59dcc3a8059607dd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bernd=20Ble=C3=9Fmann?= Date: Fri, 13 Jul 2018 15:38:24 +0200 Subject: [PATCH] SL::Mailer: content_type statt contenttype, so wie im POD beschrieben --- SL/Form.pm | 2 +- SL/Mailer.pm | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/SL/Form.pm b/SL/Form.pm index b9835881d..0ecb2219d 100644 --- a/SL/Form.pm +++ b/SL/Form.pm @@ -1110,7 +1110,7 @@ sub send_email { my @attfiles; # if we send html or plain text inline if (($self->{format} eq 'html') && ($self->{sendmode} eq 'inline')) { - $mail->{contenttype} = "text/html"; + $mail->{content_type} = "text/html"; $mail->{message} =~ s/\r//g; $mail->{message} =~ s/\n/
\n/g; $full_signature =~ s/\n/
\n/g; diff --git a/SL/Mailer.pm b/SL/Mailer.pm index 67f46fe21..5b793d43a 100644 --- a/SL/Mailer.pm +++ b/SL/Mailer.pm @@ -209,7 +209,7 @@ sub _create_message { if ($self->{message}) { push @parts, Email::MIME->create( attributes => { - content_type => $self->{contenttype}, + content_type => $self->{content_type}, charset => $self->{charset}, encoding => 'quoted-printable', }, @@ -217,7 +217,7 @@ sub _create_message { ); push @{ $self->{headers} }, ( - 'Content-Type' => qq|$self->{contenttype}; charset="$self->{charset}"|, + 'Content-Type' => qq|$self->{content_type}; charset="$self->{charset}"|, ); } @@ -243,12 +243,12 @@ sub send { } # Set defaults & headers - $self->{charset} = 'UTF-8'; - $self->{contenttype} ||= "text/plain"; - $self->{headers} = [ - Subject => $self->{subject}, - 'Message-ID' => '<' . $self->_create_message_id . '>', - 'X-Mailer' => "kivitendo " . SL::Version->get_version, + $self->{charset} = 'UTF-8'; + $self->{content_type} ||= "text/plain"; + $self->{headers} = [ + Subject => $self->{subject}, + 'Message-ID' => '<' . $self->_create_message_id . '>', + '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; -- 2.20.1