Bug 525195 - Invisible fields still show up in the "New:" bugmail (fields whose visib...

r=dkl,a=LpSolit

diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm
index 1fb5ea977e1c69b0882b36094c1e5d7e1ebe9b7d..089d3013e5802a99414021591305380cd7c1e512 100644 (file)
--- a/Bugzilla/BugMail.pm
+++ b/Bugzilla/BugMail.pm
@@ -443,11 +443,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);
         }