From 7ac0c72189843239a91ddbb1de55868cbe00845f Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Wed, 12 Jun 2013 12:17:10 -0400
Subject: [PATCH] Bug 877083 - "Ignore Bug Mail" shouldn't lead to request
 email being dropped r=glob,a=LpSolit

---
 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 0ecc545fdc..98029a1b14 100644
--- a/Bugzilla/Flag.pm
+++ b/Bugzilla/Flag.pm
@@ -997,9 +997,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 8d3d763061..933b9ce72e 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -833,9 +833,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 %]
-- 
2.47.2