Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 440259: User::match should be using Bugzilla::User->new_from_list - Patch by arbingersys <arbingersys@gmail.com> r=LpSolit a=mkanat

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@256773 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
lpsolit%gmail.com 2009-03-31 19:35:25 +00:00
parent f4803560fd
commit 2b875b5ece
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/webtools/bugzilla/Bugzilla/User.pm
View File

@ -1015,7 +1015,7 @@ sub match {
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 ";
my $query = "SELECT DISTINCT userid FROM profiles ";
if (Bugzilla->params->{'usevisibilitygroups'}) {
$query .= "INNER JOIN user_group_map
ON user_group_map.user_id = profiles.userid ";
@ -1034,10 +1034,8 @@ sub match {
# Execute the query, retrieve the results, and make them into
# User objects.
my $user_logins = $dbh->selectcol_arrayref($query, undef, ($wildstr, $wildstr));
foreach my $login_name (@$user_logins) {
push(@users, new Bugzilla::User({ name => $login_name }));
}
my $user_ids = $dbh->selectcol_arrayref($query, undef, ($wildstr, $wildstr));
@users = @{Bugzilla::User->new_from_list($user_ids)};
}
else { # try an exact match
# Exact matches don't care if a user is disabled.
@ -1053,7 +1051,7 @@ sub match {
if (!scalar(@users) && length($str) >= 3) {
trick_taint($str);
my $query = "SELECT DISTINCT login_name FROM profiles ";
my $query = "SELECT DISTINCT userid FROM profiles ";
if (Bugzilla->params->{'usevisibilitygroups'}) {
$query .= "INNER JOIN user_group_map
ON user_group_map.user_id = profiles.userid ";
@ -1070,10 +1068,8 @@ sub match {
$query .= " ORDER BY login_name ";
$query .= $dbh->sql_limit($limit) if $limit;
my $user_logins = $dbh->selectcol_arrayref($query, undef, ($str, $str));
foreach my $login_name (@$user_logins) {
push(@users, new Bugzilla::User({ name => $login_name }));
}
my $user_ids = $dbh->selectcol_arrayref($query, undef, ($str, $str));
@users = @{Bugzilla::User->new_from_list($user_ids)};
}
return \@users;
}