summaryrefslogtreecommitdiffstats
path: root/extensions/SecureMail/Extension.pm
diff options
context:
space:
mode:
authorDavid Lawrence <dkl@mozilla.com>2015-01-21 17:12:16 +0100
committerDavid Lawrence <dkl@mozilla.com>2015-01-21 17:12:16 +0100
commit5bf6a94bc50dab384b25af06c1146de2c6025cc5 (patch)
tree3d866721c2f0e972a5dcddb9d3f2f86e1ac81b7b /extensions/SecureMail/Extension.pm
parentcc0c7334f275da3e372caa78de1668c71e690ea8 (diff)
downloadbugzilla-5bf6a94bc50dab384b25af06c1146de2c6025cc5.tar.gz
bugzilla-5bf6a94bc50dab384b25af06c1146de2c6025cc5.tar.xz
Bug 1119184: Securemail incorrectly displays " You will have to contact bugzilla-admin@foo to reset your password." for whines
Diffstat (limited to 'extensions/SecureMail/Extension.pm')
-rw-r--r--extensions/SecureMail/Extension.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/extensions/SecureMail/Extension.pm b/extensions/SecureMail/Extension.pm
index 582b9e127..b43c82346 100644
--- a/extensions/SecureMail/Extension.pm
+++ b/extensions/SecureMail/Extension.pm
@@ -557,10 +557,12 @@ sub _make_secure {
# No encryption key provided; send a generic, safe email.
my $template = Bugzilla->template;
my $message;
+ my $email_type = $email->header('X-Bugzilla-Type');
my $vars = {
'urlbase' => correct_urlbase(),
'bug_id' => $bug_id,
- 'maintainer' => Bugzilla->params->{'maintainer'}
+ 'maintainer' => Bugzilla->params->{'maintainer'},
+ 'email_type' => $email_type
};
$template->process('account/email/encryption-required.txt.tmpl',