From: Frédéric Buclin <LpSolit@gmail.com>
Date: Thu, 14 May 2015 12:55:43 +0000 (+0200)
Subject: Bug 1162914: Editing a user field when confirmuniqueusermatch = true no longer works
X-Git-Tag: release-5.1.1~250
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ccda2ce4c39be8c833b9afff2ba28622c3e48dca;p=thirdparty%2Fbugzilla.git

Bug 1162914: Editing a user field when confirmuniqueusermatch = true no longer works
r=dkl a=glob
---

diff --git a/template/en/default/global/confirm-user-match.html.tmpl b/template/en/default/global/confirm-user-match.html.tmpl
index a3534b72a0..613f097e18 100644
--- a/template/en/default/global/confirm-user-match.html.tmpl
+++ b/template/en/default/global/confirm-user-match.html.tmpl
@@ -147,7 +147,7 @@
 
   [% SET exclude_these = ['Bugzilla_login', 'Bugzilla_password'] %]
   [% FOREACH key IN matches.keys %]
-    [% exclude_these.push(key) IF cgi.param(key) == '' %]
+    [% exclude_these.push(key) IF Bugzilla.cgi.param(key) == '' %]
   [% END %]
   [% SET exclude = '^' _ exclude_these.join('|') _ '$' %]
   [% PROCESS "global/hidden-fields.html.tmpl" exclude = exclude %]