diff options
| author | Dave Lawrence <dlawrence@mozilla.com> | 2012-06-05 05:02:59 +0200 |
|---|---|---|
| committer | Dave Lawrence <dlawrence@mozilla.com> | 2012-06-05 05:02:59 +0200 |
| commit | d8124f85dd4d1ff0a207d0c033a4333af42d62eb (patch) | |
| tree | 417cd4df4b1ff5e8daf1a81c7886514800ee0209 /template/en/default/global | |
| parent | b8eb6641bd474fcd97f27315c46fde6dfff5fe76 (diff) | |
| parent | 6b9b50db744c603dbfa0c7ae5aac8dca4e58b0cd (diff) | |
| download | bugzilla-d8124f85dd4d1ff0a207d0c033a4333af42d62eb.tar.gz bugzilla-d8124f85dd4d1ff0a207d0c033a4333af42d62eb.tar.xz | |
merged with bugzilla/4.2
Diffstat (limited to 'template/en/default/global')
| -rw-r--r-- | template/en/default/global/confirm-user-match.html.tmpl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/template/en/default/global/confirm-user-match.html.tmpl b/template/en/default/global/confirm-user-match.html.tmpl index 5549b516d..cff20d237 100644 --- a/template/en/default/global/confirm-user-match.html.tmpl +++ b/template/en/default/global/confirm-user-match.html.tmpl @@ -150,8 +150,6 @@ [% 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') %] @@ -176,8 +174,10 @@ [% IF matchsuccess == 1 %] - [% SET exclude_these = - matches.keys.merge(['Bugzilla_login', 'Bugzilla_password']) %] + [% SET exclude_these = ['Bugzilla_login', 'Bugzilla_password'] %] + [% FOREACH key IN matches.keys %] + [% exclude_these.push(key) IF cgi.param(key) == '' %] + [% END %] [% SET exclude = '^' _ exclude_these.join('|') _ '$' %] [% PROCESS "global/hidden-fields.html.tmpl" exclude = exclude %] |