1 files changed, 20 insertions, 3 deletions

diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm
index 55eeeab25..62f04e5da 100644
--- a/Bugzilla/BugMail.pm
+++ b/Bugzilla/BugMail.pm
@@ -130,7 +130,7 @@ sub Send {
     my $comments = $bug->comments({ after => $start, to => $end });
     # Skip empty comments.
     @$comments = grep { $_->type || $_->body =~ /\S/ } @$comments;
-
+    
     ###########################################################################
     # Start of email filtering code
     ###########################################################################
@@ -267,7 +267,16 @@ sub Send {
             }
 
             # Make sure the user isn't in the nomail list, and the dep check passed.
-            if ($user->email_enabled && $dep_ok) {
+            # BMO: normally we would check the login names of the
+            # user objects in the bugmail_recipients hook instead. There we could
+            # remove the (bugs|tld)$ addresses from the recipients. But the hook comes
+            # to early before watchers are decided and these addresses need to be 
+            # there for this to work. This may change with recent enhancements to 
+            # component watching. need to investigate further.
+            if ($user->email_enabled && $dep_ok &&
+                ($user->login !~ /bugs$/) &&
+                ($user->login !~ /\.tld$/))
+            {
                 # OK, OK, if we must. Email the user.
                 $sent_mail = sendMail(
                     { to       => $user, 
@@ -352,6 +361,14 @@ sub sendMail {
     push(@watchingrel, 'None') unless @watchingrel;
     push @watchingrel, map { user_id_to_login($_) } @$watchingRef;
 
+    my @changedfields = uniq map { $_->{field_name} } @display_diffs;
+
+    # Add attachments.created to changedfields if one or more
+    # comments contain information about a new attachment
+    if (grep($_->type == CMT_ATTACHMENT_CREATED, @send_comments)) {
+        push(@changedfields, 'attachments.created');
+    }
+
     my $vars = {
         date => $date,
         to_user => $user,
@@ -362,7 +379,7 @@ sub sendMail {
         reasonswatchheader => join(" ", @watchingrel),
         changer => $changer,
         diffs => \@display_diffs,
-        changedfields => [uniq map { $_->{field_name} } @display_diffs],
+        changedfields => \@changedfields, 
         new_comments => \@send_comments,
         threadingmarker => build_thread_marker($bug->id, $user->id, !$bug->lastdiffed),
     };