Bug 1265432 - backport upstream bug 1263923 to bmo/4.2 - X-Bugzilla-Who header is...

diff --git a/template/en/default/email/header-common.txt.tmpl b/template/en/default/email/header-common.txt.tmpl
index f7bc996d8940c4328f350994a27d44b29cbc67d8..3576698d0b9c06bf9761135b435c021256c7cea0 100644 (file)
--- a/template/en/default/email/header-common.txt.tmpl
+++ b/template/en/default/email/header-common.txt.tmpl
@@ -17,7 +17,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 %]