summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Bugzilla/Config/UserMatch.pm7
-rw-r--r--Bugzilla/User.pm11
-rw-r--r--template/en/default/admin/params/usermatch.html.tmpl6
-rw-r--r--template/en/default/global/confirm-user-match.html.tmpl3
4 files changed, 3 insertions, 24 deletions
diff --git a/Bugzilla/Config/UserMatch.pm b/Bugzilla/Config/UserMatch.pm
index 819247e99..9e19f1d2b 100644
--- a/Bugzilla/Config/UserMatch.pm
+++ b/Bugzilla/Config/UserMatch.pm
@@ -47,13 +47,6 @@ sub get_param_list {
},
{
- name => 'usermatchmode',
- type => 's',
- choices => ['off', 'wildcard', 'search'],
- default => 'off'
- },
-
- {
name => 'maxusermatches',
type => 't',
default => '1000',
diff --git a/Bugzilla/User.pm b/Bugzilla/User.pm
index d373f019d..1e20ef73d 100644
--- a/Bugzilla/User.pm
+++ b/Bugzilla/User.pm
@@ -1012,11 +1012,7 @@ sub match {
# first try wildcards
my $wildstr = $str;
- if ($wildstr =~ s/\*/\%/g # don't do wildcards if no '*' in the string
- # or if we only want exact matches
- && Bugzilla->params->{'usermatchmode'} ne 'off')
- {
-
+ if ($wildstr =~ s/\*/\%/g) { # don't do wildcards if no '*' in the string
# Build the query.
trick_taint($wildstr);
my $query = "SELECT DISTINCT login_name FROM profiles ";
@@ -1054,10 +1050,7 @@ sub match {
}
# then try substring search
- if ((scalar(@users) == 0)
- && (Bugzilla->params->{'usermatchmode'} eq 'search')
- && (length($str) >= 3))
- {
+ if (!scalar(@users) && length($str) >= 3) {
trick_taint($str);
my $query = "SELECT DISTINCT login_name FROM profiles ";
diff --git a/template/en/default/admin/params/usermatch.html.tmpl b/template/en/default/admin/params/usermatch.html.tmpl
index 178a72844..54f150900 100644
--- a/template/en/default/admin/params/usermatch.html.tmpl
+++ b/template/en/default/admin/params/usermatch.html.tmpl
@@ -29,12 +29,6 @@
"needs to be selected. This option should not be enabled on " _
"sites where there are a large number of users.",
- usermatchmode => "Allow match strings to be entered for user names when entering " _
- "and editing ${terms.bugs}.<p> " _
- "'off' disables matching,<br> " _
- "'wildcard' allows only wildcards,<br> " _
- "and 'search' allows both wildcards and substring (freetext) matches.",
-
maxusermatches => "Search for no more than this many matches.<br> " _
"If set to '1', no users will be displayed on ambiguous matches. " _
"This is useful for user privacy purposes.<br> " _
diff --git a/template/en/default/global/confirm-user-match.html.tmpl b/template/en/default/global/confirm-user-match.html.tmpl
index 5b209dfce..f961ee0b9 100644
--- a/template/en/default/global/confirm-user-match.html.tmpl
+++ b/template/en/default/global/confirm-user-match.html.tmpl
@@ -132,8 +132,7 @@
<b>[% query.value.users.0.identity FILTER html %]</b>
[% END %]
[% ELSE %]
- [% IF (query.key.length < 3) && !(Param('emailsuffix'))
- && (Param('usermatchmode') == 'search') %]
+ [% IF (query.key.length < 3) && !Param('emailsuffix') %]
<font color="#FF0000">was too short for substring match
(minimum 3 characters)</font>
[% ELSE %]