diff options
Diffstat (limited to 'Bugzilla')
-rw-r--r-- | Bugzilla/Config/UserMatch.pm | 7 | ||||
-rw-r--r-- | Bugzilla/User.pm | 11 |
2 files changed, 2 insertions, 16 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 "; |