projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master', remote branch 'origin'
[kivitendo-erp.git]
/
SL
/
Mailer
/
Sendmail.pm
diff --git
a/SL/Mailer/Sendmail.pm
b/SL/Mailer/Sendmail.pm
index
c4ab662
..
ea1e63b
100644
(file)
--- a/
SL/Mailer/Sendmail.pm
+++ b/
SL/Mailer/Sendmail.pm
@@
-2,6
+2,7
@@
package SL::Mailer::Sendmail;
use strict;
use strict;
+use Encode;
use IO::File;
use SL::Template;
use IO::File;
use SL::Template;
@@
-17,7
+18,7
@@
sub init {
Rose::Object::init(@_);
Rose::Object::init(@_);
- my $email = $
self->mailer->recode($self->myconfig->{email})
;
+ my $email = $
::locale->is_utf8 ? Encode::encode('utf-8', $self->myconfig->{email}) : $self->myconfig->{email}
;
$email =~ s/[^\w\.\-\+=@]//ig;
my %temp_form = ( %{ $self->form }, myconfig_email => $email );
$email =~ s/[^\w\.\-\+=@]//ig;
my %temp_form = ( %{ $self->form }, myconfig_email => $email );