From 38577d69738bb33f0c43d5346a1c4abebee975fa Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Tue, 25 Jun 2013 10:33:33 -0400
Subject: Bug 877083 - "Ignore Bug Mail" shouldn't lead to request email being
 dropped

---
 Bugzilla/Flag.pm                       | 3 ---
 template/en/default/bug/edit.html.tmpl | 8 +++++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Bugzilla/Flag.pm b/Bugzilla/Flag.pm
index d3e9b1d37..5f4f90b6c 100644
--- a/Bugzilla/Flag.pm
+++ b/Bugzilla/Flag.pm
@@ -1021,9 +1021,6 @@ sub notify {
     }
 
     foreach my $to (keys %recipients) {
-        # Skip sending if user is ignoring the bug.
-        next if ($recipients{$to} && $recipients{$to}->is_bug_ignored($bug->id));
-
         # Add threadingmarker to allow flag notification emails to be the
         # threaded similar to normal bug change emails.
         my $thread_user_id = $recipients{$to} ? $recipients{$to}->id : 0;
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index c43935c2f..e641cee93 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -871,9 +871,11 @@
       </th>
       <td>
         <input type="hidden" name="defined_bug_ignored" value="1">
-        <input type="checkbox" name="bug_ignored" id="bug_ignored" value="1"
-               [% ' checked="checked"' IF user.is_bug_ignored(bug.id) %]>
-        (never email me about this [% terms.bug %])
+        <span title="You will still receive emails for flag requests directed at you.">
+          <input type="checkbox" name="bug_ignored" id="bug_ignored" value="1"
+                 [% ' checked="checked"' IF user.is_bug_ignored(bug.id) %]>
+          (never email me about this [% terms.bug %])
+        </span>
       </td>
     </tr>
   [% END %]
-- 
cgit v1.2.3-24-g4f1b