From: Max Kanat-Alexander <mkanat@bugzilla.org>
Date: Tue, 15 Feb 2011 16:20:06 +0000 (-0800)
Subject: Bug 634243: Stop confirm-match.html.tmpl from sending extra, empty values for
X-Git-Tag: bugzilla-4.0~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=735c9ef24aaeee152d985678b9be087c69b8bce0;p=thirdparty%2Fbugzilla.git

Bug 634243: Stop confirm-match.html.tmpl from sending extra, empty values for
each field being confirmed. This fixes a bug where confirming would fail,
displaying a value with an extra comma at the end.
r=LpSolit, a=LpSolit
---

diff --git a/template/en/default/global/confirm-user-match.html.tmpl b/template/en/default/global/confirm-user-match.html.tmpl
index 67a901f0e3..5549b516d8 100644
--- a/template/en/default/global/confirm-user-match.html.tmpl
+++ b/template/en/default/global/confirm-user-match.html.tmpl
@@ -150,6 +150,8 @@
                 [% ELSE %]
                   matched
                   <b>[% query.value.users.0.identity FILTER html %]</b>
+                  <input type="hidden" name="[% field.key FILTER html %]"
+                         value="[% query.value.users.0.login FILTER html %]">
                 [% END %]
             [% ELSE %]
                 [% IF (query.key.length < 3) && !Param('emailsuffix') %]
@@ -174,7 +176,10 @@
 
 [% IF matchsuccess == 1 %]
 
-  [% PROCESS "global/hidden-fields.html.tmpl" exclude="^Bugzilla_(login|password)$" %]
+  [% SET exclude_these = 
+           matches.keys.merge(['Bugzilla_login', 'Bugzilla_password']) %]
+  [% SET exclude = '^' _ exclude_these.join('|') _ '$' %]
+  [% PROCESS "global/hidden-fields.html.tmpl" exclude = exclude %]
 
   <p>
     <input type="submit" id="continue" value="Continue">