From: Matt Tyson <mtyson@redhat.com>
Date: Thu, 4 Oct 2012 08:08:39 +0000 (+0800)
Subject: Bug 796386:  Warn user if bugmails have been disabled
X-Git-Tag: bugzilla-4.4rc1~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21fd6817129c8e8908508ca07944586fe0225160;p=thirdparty%2Fbugzilla.git

Bug 796386:  Warn user if bugmails have been disabled
r=glob, a=LpSolit
---

diff --git a/template/en/default/account/prefs/email.html.tmpl b/template/en/default/account/prefs/email.html.tmpl
index 0c016473d8..f810f6486a 100644
--- a/template/en/default/account/prefs/email.html.tmpl
+++ b/template/en/default/account/prefs/email.html.tmpl
@@ -19,6 +19,15 @@
   #               receiving mail for that reason when in that role.
   #%]
 
+[%# If the user's bugmail has been disabled by admins, show a warning. %]
+[% IF user.email_disabled %]
+  <div class="warningmessages">
+    Your [% terms.bug %]mail has been disabled by the [% terms.Bugzilla %]
+    administrator.  Please contact [% Param('maintainer') %] to enable
+    [%+ terms.bug %]mails.
+  </div>
+[% END %]
+
 <p>
   If you don't like getting a notification for "trivial"
   changes to [% terms.bugs %], you can use the settings below to