summaryrefslogtreecommitdiffstats
path: root/Bugzilla
diff options
context:
space:
mode:
authorolav%bkor.dhs.org <>2007-02-06 06:34:20 +0100
committerolav%bkor.dhs.org <>2007-02-06 06:34:20 +0100
commitdf4dade550d26c7859e0f1ca457c040d65c3e533 (patch)
treee0252bf65246ec4a12a585cfc2f3a6e197b031af /Bugzilla
parente0f4e652619de64f3d16463a5f6ff053dafa1581 (diff)
downloadbugzilla-df4dade550d26c7859e0f1ca457c040d65c3e533.tar.gz
bugzilla-df4dade550d26c7859e0f1ca457c040d65c3e533.tar.xz
Bug 366187: Fix regression; ensure dependent changed bugmail will be sent out
Patch by Olav Vitters <olav@bkor.dhs.org> r=LpSolit a=LpSolit
Diffstat (limited to 'Bugzilla')
-rw-r--r--Bugzilla/BugMail.pm1
-rw-r--r--Bugzilla/User.pm9
2 files changed, 9 insertions, 1 deletions
diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm
index a4462b7ba..7a35d9f9e 100644
--- 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 c6fd0b524..3e952e56d 100644
--- 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);