From: timeless%mozdev.org <>
Date: Mon, 30 Jul 2007 12:46:25 +0000 (+0000)
Subject: Bug 388826 "cannot make a conclusive match" should not be said if the only reason... 
X-Git-Tag: bugzilla-3.1.2~94
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f58650e43e01119d30be25befd275f4d4f380a97;p=thirdparty%2Fbugzilla.git

Bug 388826 "cannot make a conclusive match" should not be said if the only reason is confirmuniqueusermatch
r=wicked a=lpsolit
---

diff --git a/Bugzilla/User.pm b/Bugzilla/User.pm
index 080a98abb7..f73dd06dfb 100644
--- a/Bugzilla/User.pm
+++ b/Bugzilla/User.pm
@@ -1344,6 +1344,7 @@ sub match_field {
     $vars->{'fields'}        = $fields; # fields being matched
     $vars->{'matches'}       = $matches; # matches that were made
     $vars->{'matchsuccess'}  = $matchsuccess; # continue or fail
+    $vars->{'matchmultiple'} = $match_multiple;
 
     print Bugzilla->cgi->header();
 
diff --git a/template/en/default/global/confirm-user-match.html.tmpl b/template/en/default/global/confirm-user-match.html.tmpl
index 38ac8dd591..a4260c5af0 100644
--- a/template/en/default/global/confirm-user-match.html.tmpl
+++ b/template/en/default/global/confirm-user-match.html.tmpl
@@ -54,11 +54,18 @@
   >
 
   <p>
-    [% terms.Bugzilla %] cannot make a conclusive match for one or more of the
-    names and/or email addresses you entered on the previous page.<br>
-    Please examine the lists of potential matches below and select the
-    one you want, or go back to the previous page to revise the names
-    you entered.
+    [% IF matchmultiple %]
+      [% terms.Bugzilla %] cannot make a conclusive match for one or more
+      of the names and/or email addresses you entered on the previous page.
+      <br>Please examine the lists of potential matches below and select the
+      ones you want,
+    [% ELSE %]
+      [% terms.Bugzilla %] is configured to require verification whenever
+      you enter a name or partial email address.
+      <br>Below are the names/addresses you entered and the matched accounts.
+      Please confirm that they are correct,
+    [% END %]
+    or go back to the previous page to revise the names you entered.
   </p>
 [% ELSE %]
   [% PROCESS global/header.html.tmpl title="Match Failed" %]