diff options
| author |   Jeff Fearn <jfearn@redhat.com> | 2022-07-08 12:44:06 +1000 |
|---|---|---|
| committer | Jeff Fearn <jfearn@redhat.com> | 2022-07-08 12:44:06 +1000 |
| commit | 3d2f3f270e56544d12c3853e0776ce8223f0be55 (patch) | |
| tree | 095b1bf0b85881d20e9e71f2af9434b490862368 | |
| parent | Bug 2104516 - invite_manager fails with network error (diff) | |
| download | bugzilla-3d2f3f270e56544d12c3853e0776ce8223f0be55.tar.gz bugzilla-3d2f3f270e56544d12c3853e0776ce8223f0be55.tar.bz2 bugzilla-3d2f3f270e56544d12c3853e0776ce8223f0be55.zip | |
Bug 2052784 - don't email me when I cancel a flag I requested
Change-Id: I3efc77913bdfed9a1a92d80113d5e9dc9d63ef71
| -rw-r--r-- | Bugzilla/Flag.pm | 1 | ||||
| -rw-r--r-- | template/en/default/email/header-common.txt.tmpl | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Bugzilla/Flag.pm b/Bugzilla/Flag.pm index d1068fbfd..f5d5b0e22 100644 --- a/Bugzilla/Flag.pm +++ b/Bugzilla/Flag.pm @@ -1216,6 +1216,7 @@ sub notify { } } elsif ($old_flag + && $old_flag->setter->id != Bugzilla->user->id && $old_flag->status eq '?' && (!$flag || $flag->status ne '?')) { diff --git a/template/en/default/email/header-common.txt.tmpl b/template/en/default/email/header-common.txt.tmpl index 2651e4d80..2094ddb42 100644 --- a/template/en/default/email/header-common.txt.tmpl +++ b/template/en/default/email/header-common.txt.tmpl @@ -11,7 +11,7 @@ X-Bugzilla-Classification: [% bug.classification %] X-Bugzilla-Product: [% bug.product %] X-Bugzilla-Keywords: [% bug.keywords %] X-Bugzilla-Severity: [% bug.bug_severity %] -X-Bugzilla-Who: [% changer.login %] +X-Bugzilla-Who: [% changer.login || user.login %] X-Bugzilla-Status: [% bug.bug_status %] X-Bugzilla-Resolution: [% bug.resolution %] X-Bugzilla-Priority: [% bug.priority %] |