X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FMailer.pm;h=5b793d43a7ab0471d729fad043d260746c1ee0f5;hb=07c471d4dcca18d5bb6394fc7b7d0dbea74b3066;hp=67f46fe21a483fd584b10072361b81d876553c61;hpb=d63305ba3bea55eec4aac2df26149f439c086508;p=kivitendo-erp.git 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;