Bug 366187: Fix regression; ensure dependent changed bugmail will be sent out

Patch by Olav Vitters <olav@bkor.dhs.org> r=LpSolit a=LpSolit

diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm
index a4462b7ba5995c522385689a960cdda931d2bf72..7a35d9f9e0d739f0696e9687120eda46660a0aeb 100644 (file)
--- a/Bugzilla/BugMail.pm
+++ b/Bugzilla/BugMail.pm
@@ -438,6 +438,7 @@ sub Send {
                                           $relationship, 
                                           $diffs, 
                                           $comments{$lang},
+                                          $deptext,
                                           $changer,
                                           !$start))
                 {

diff --git a/Bugzilla/User.pm b/Bugzilla/User.pm
index c6fd0b524e5e9a72095ce99635ab1af5cfc39c77..3e952e56df96fd801e9d35a77cc17dfeb02a9dd5 100644 (file)
--- a/Bugzilla/User.pm
+++ b/Bugzilla/User.pm
@@ -1338,7 +1338,8 @@ our %names_to_events = (
 # Note: the "+" signs before the constants suppress bareword quoting.
 sub wants_bug_mail {
     my $self = shift;
-    my ($bug_id, $relationship, $fieldDiffs, $commentField, $changer, $bug_is_new) = @_;
+    my ($bug_id, $relationship, $fieldDiffs, $commentField, $dependencyText,
+        $changer, $bug_is_new) = @_;
 
     # Make a list of the events which have happened during this bug change,
     # from the point of view of this user.    
@@ -1390,6 +1391,12 @@ sub wants_bug_mail {
         $events{+EVT_COMMENT} = 1;
     }
     
+    # Dependent changed bugmails must have an event to ensure the bugmail is
+    # emailed.
+    if ($dependencyText ne '') {
+        $events{+EVT_DEPEND_BLOCK} = 1;
+    }
+
     my @event_list = keys %events;
     
     my $wants_mail = $self->wants_mail(\@event_list, $relationship);