Bug 1263923 - X-Bugzilla-Who header is not set for flag mails

r=dkl

diff --git a/template/en/default/email/header-common.txt.tmpl b/template/en/default/email/header-common.txt.tmpl
index 02bd38e133774048c63231c61e193dbb7ec73397..101237ee7c29a003a94ad3c29673713aa22c1800 100644 (file)
--- a/template/en/default/email/header-common.txt.tmpl
+++ b/template/en/default/email/header-common.txt.tmpl
@@ -13,7 +13,7 @@ X-Bugzilla-Component: [% bug.component %]
 X-Bugzilla-Version: [% bug.version %]
 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 %]