aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Bugzilla/BugMail.pm3
-rw-r--r--Bugzilla/MIME.pm6
2 files changed, 6 insertions, 3 deletions
diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm
index 110a1ffaf..e98dae149 100644
--- a/Bugzilla/BugMail.pm
+++ b/Bugzilla/BugMail.pm
@@ -21,6 +21,7 @@ use Bugzilla::Mailer;
use Bugzilla::Hook;
use Bugzilla::MIME;
+use Encode qw();
use Date::Parse;
use Date::Format;
use Scalar::Util qw(blessed);
@@ -451,6 +452,7 @@ sub _generate_bugmail {
encoding => 'quoted-printable',
},
body_str => $msg_text,
+ encode_check => Encode::FB_DEFAULT
)
);
if ($user->setting('email_format') eq 'html') {
@@ -463,6 +465,7 @@ sub _generate_bugmail {
encoding => 'quoted-printable',
},
body_str => $msg_html,
+ encode_check => Encode::FB_DEFAULT
);
}
diff --git a/Bugzilla/MIME.pm b/Bugzilla/MIME.pm
index 8c6c141bb..d6046198f 100644
--- a/Bugzilla/MIME.pm
+++ b/Bugzilla/MIME.pm
@@ -14,7 +14,7 @@ use warnings;
use parent qw(Email::MIME);
sub new {
- my ($class, $msg) = @_;
+ my ($class, $msg, $args) = @_;
state $use_utf8 = Bugzilla->params->{'utf8'};
# Template-Toolkit trims trailing newlines, which is problematic when
@@ -54,7 +54,7 @@ sub new {
# you're running on. See http://perldoc.perl.org/perlport.html#Newlines
$msg =~ s/(?:\015+)?\012/\015\012/msg;
- return $class->SUPER::new($msg);
+ return $class->SUPER::new($msg, $args);
}
sub as_string {
@@ -113,7 +113,7 @@ workarounds.
=head1 SYNOPSIS
use Bugzilla::MIME;
- my $email = Bugzilla::MIME->new($message);
+ my $email = Bugzilla::MIME->new($message, $args);
=head1 DESCRIPTION