summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Lawrence <dlawrence@mozilla.com>2012-08-23 23:45:01 +0200
committerDave Lawrence <dlawrence@mozilla.com>2012-08-23 23:45:01 +0200
commitacfc36b72cb62177cc9e844bb3f1639e7e9828a4 (patch)
treef399a1b5e450d226ec748134e3f5feebb600c241
parentd8c9e8b0daf765af77a2be0cc47aa4d469cc3230 (diff)
downloadbugzilla-acfc36b72cb62177cc9e844bb3f1639e7e9828a4.tar.gz
bugzilla-acfc36b72cb62177cc9e844bb3f1639e7e9828a4.tar.xz
Bug 785219 - Secure bugmail no longer includes subject of bug
-rw-r--r--extensions/SecureMail/Extension.pm6
1 files changed, 2 insertions, 4 deletions
diff --git a/extensions/SecureMail/Extension.pm b/extensions/SecureMail/Extension.pm
index d4d29b5c0..43c561ed9 100644
--- a/extensions/SecureMail/Extension.pm
+++ b/extensions/SecureMail/Extension.pm
@@ -31,8 +31,6 @@ use Bugzilla::User;
use Bugzilla::Util qw(correct_urlbase trim trick_taint is_7bit_clean);
use Bugzilla::Error;
use Bugzilla::Mailer;
-use Bugzilla::Constants;
-use Bugzilla::Install::Util qw(vers_cmp);
use Crypt::OpenPGP::Armour;
use Crypt::OpenPGP::KeyRing;
@@ -366,13 +364,13 @@ sub _make_secure {
$email->walk_parts(sub {
my ($part) = @_;
- return if $part->parts > 1; # Top-level
if ($sanitise_subject && $part->content_type =~ /text\/plain/) {
if (!is_7bit_clean($subject)) {
$part->encoding_set('quoted-printable');
}
$part->body_str_set("Subject: $subject\015\012\015\012" . $part->body_str);
}
+ return if $part->parts > 1; # Top-level
$to_encrypt .= "--$old_boundary\n" . $part->as_string . "\n";
});
$to_encrypt .= "--$old_boundary--";
@@ -421,11 +419,11 @@ sub _make_secure {
if ($sanitise_subject) {
$email->walk_parts(sub {
my ($part) = @_;
- return if $part->parts > 1; # Top-level
if ($part->content_type =~ /text\/plain/) {
# Subject gets placed in the body so it can still be read
$part->body_str_set("Subject: $subject\015\012\015\012" . $part->body);
}
+ return if $part->parts > 1; # Top-level
});
}