diff options
| -rw-r--r-- | Bugzilla/User.pm | 5 | ||||
| -rw-r--r-- | template/en/default/global/confirm-user-match.html.tmpl | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/Bugzilla/User.pm b/Bugzilla/User.pm index 240fcfcdb..7dd86f301 100644 --- a/Bugzilla/User.pm +++ b/Bugzilla/User.pm @@ -1066,7 +1066,8 @@ sub match { # first try wildcards my $wildstr = $str; - if ($wildstr =~ s/\*/\%/g) { # don't do wildcards if no '*' in the string + # Do not do wildcards if there is no '*' in the string. + if ($wildstr =~ s/\*/\%/g && $user->id) { # Build the query. trick_taint($wildstr); my $query = "SELECT DISTINCT userid FROM profiles "; @@ -1101,7 +1102,7 @@ sub match { } # then try substring search - if (!scalar(@users) && length($str) >= 3) { + if (!scalar(@users) && length($str) >= 3 && $user->id) { trick_taint($str); my $query = "SELECT DISTINCT userid FROM profiles "; diff --git a/template/en/default/global/confirm-user-match.html.tmpl b/template/en/default/global/confirm-user-match.html.tmpl index 40dccc6b5..67a901f0e 100644 --- a/template/en/default/global/confirm-user-match.html.tmpl +++ b/template/en/default/global/confirm-user-match.html.tmpl @@ -57,7 +57,7 @@ [% IF matchsuccess == 1 %] [% PROCESS global/header.html.tmpl title="Confirm Match" %] -[% USE Bugzilla %] + [% USE Bugzilla %] <form method="post" [% IF script -%] @@ -86,9 +86,13 @@ [% PROCESS global/header.html.tmpl title="Match Failed" %] <p> [% terms.Bugzilla %] was unable to make any match at all for one or more of - the names and/or email addresses you entered on the previous page.<br> - Please go back and try other names or email addresses. + the names and/or email addresses you entered on the previous page. + [% IF !user.id %] + <b>Note: You are currently logged out. Only exact matches against e-mail + addresses will be performed.</b> + [% END %] </p> + <p>Please go back and try other names or email addresses.</p> [% END %] <table border="0"> |