From: Alex Schuilenburg <alex@schuilenburg.org>
Date: Thu, 14 Mar 2013 20:53:50 +0000 (-0400)
Subject: Bug 525195 - Invisible fields still show up in the "New:" bugmail (fields whose visib... 
X-Git-Tag: bugzilla-4.4~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a56de92c5bfc9b36f0a539a06b559ddd6b0b4a2c;p=thirdparty%2Fbugzilla.git

Bug 525195 - Invisible fields still show up in the "New:" bugmail (fields whose visibility depends on another field)
r=dkl,a=LpSolit
---

diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm
index 123a30081e..0fabce67bc 100644
--- a/Bugzilla/BugMail.pm
+++ b/Bugzilla/BugMail.pm
@@ -442,11 +442,18 @@ sub _get_new_bugmail_fields {
     my $bug = shift;
     my @fields = @{ Bugzilla->fields({obsolete => 0, in_new_bugmail => 1}) };
     my @diffs;
+    my $params = Bugzilla->params;
 
     foreach my $field (@fields) {
         my $name = $field->name;
         my $value = $bug->$name;
 
+        next if !$field->is_visible_on_bug($bug)
+            || ($name eq 'classification' && !$params->{'useclassification'})
+            || ($name eq 'status_whiteboard' && !$params->{'usestatuswhiteboard'})
+            || ($name eq 'qa_contact' && !$params->{'useqacontact'})
+            || ($name eq 'target_milestone' && !$params->{'usetargetmilestone'});
+
         if (ref $value eq 'ARRAY') {
             $value = join(', ', @$value);
         }