projects
/
kivitendo-erp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
72911d5
)
SL::Mailer: Aufrufer kann optional beliebige Header mitgeben
author
Moritz Bunkus
<m.bunkus@linet.de>
Tue, 11 Aug 2020 15:50:54 +0000
(17:50 +0200)
committer
Moritz Bunkus
<m.bunkus@linet.de>
Tue, 11 Aug 2020 15:51:27 +0000
(17:51 +0200)
SL/Mailer.pm
patch
|
blob
|
history
diff --git
a/SL/Mailer.pm
b/SL/Mailer.pm
index
b066499
..
d609e3e
100644
(file)
--- a/
SL/Mailer.pm
+++ b/
SL/Mailer.pm
@@
-248,11
+248,12
@@
sub send {
# Set defaults & headers
$self->{charset} = 'UTF-8';
$self->{content_type} ||= "text/plain";
# Set defaults & headers
$self->{charset} = 'UTF-8';
$self->{content_type} ||= "text/plain";
- $self->{headers} = [
+ $self->{headers} ||= [];
+ push @{ $self->{headers} }, (
Subject => $self->{subject},
'Message-ID' => '<' . $self->_create_message_id . '>',
'X-Mailer' => "kivitendo " . SL::Version->get_version,
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;
$self->{mail_attachments} = [];
$self->{content_by_name} = $::instance_conf->get_email_journal == 1 && $::instance_conf->get_doc_files;