diff options
| author | David Lawrence <dkl@mozilla.com> | 2015-01-21 17:12:16 +0100 |
|---|---|---|
| committer | David Lawrence <dkl@mozilla.com> | 2015-01-21 17:12:16 +0100 |
| commit | 5bf6a94bc50dab384b25af06c1146de2c6025cc5 (patch) | |
| tree | 3d866721c2f0e972a5dcddb9d3f2f86e1ac81b7b /extensions/SecureMail | |
| parent | cc0c7334f275da3e372caa78de1668c71e690ea8 (diff) | |
| download | bugzilla-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')
| -rw-r--r-- | extensions/SecureMail/Extension.pm | 4 | ||||
| -rw-r--r-- | extensions/SecureMail/template/en/default/account/email/encryption-required.txt.tmpl | 6 |
2 files changed, 7 insertions, 3 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', diff --git a/extensions/SecureMail/template/en/default/account/email/encryption-required.txt.tmpl b/extensions/SecureMail/template/en/default/account/email/encryption-required.txt.tmpl index f3710bb17..3817f4fa1 100644 --- a/extensions/SecureMail/template/en/default/account/email/encryption-required.txt.tmpl +++ b/extensions/SecureMail/template/en/default/account/email/encryption-required.txt.tmpl @@ -2,14 +2,16 @@ This email would have contained sensitive information, but you have not set a PGP/GPG key or SMIME certificate in the "Secure Mail" section of your user preferences. -[% IF bug_id %] +[% IF bug_id || email_type == 'whine' %] In order to receive the full text of similar mails in the future, please go to: [%+ urlbase %]userprefs.cgi?tab=securemail and provide a key or certificate. +[% IF bug_id %] You can see this bug's current state at: [%+ urlbase %]show_bug.cgi?id=[% bug_id %] -[% ELSE %] +[% END %] +[% ELSIF email_type == 'admin' %] You will have to contact [% maintainer %] to reset your password. [% END %] |