mirror of
https://github.com/phpbb/phpbb.git
synced 2025-02-24 12:03:21 +01:00
merging r8489 into trunk
git-svn-id: file:///svn/phpbb/trunk@8490 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
4879a7a075
commit
82454165c3
@ -1835,7 +1835,7 @@ function phpbb_check_username_collisions()
|
||||
$result = $src_db->sql_query($sql);
|
||||
|
||||
$colliding_users = array();
|
||||
while ($row = $db->sql_fetchrow($result))
|
||||
while ($row = $src_db->sql_fetchrow($result))
|
||||
{
|
||||
$row['user_id'] = (int) $row['user_id'];
|
||||
if (isset($colliding_user_ids[$row['user_id']]))
|
||||
@ -1843,7 +1843,7 @@ function phpbb_check_username_collisions()
|
||||
$colliding_users[$colliding_user_ids[$row['user_id']]][] = $row;
|
||||
}
|
||||
}
|
||||
$db->sql_freeresult($result);
|
||||
$src_db->sql_freeresult($result);
|
||||
unset($colliding_user_ids);
|
||||
|
||||
$list = '';
|
||||
|
Loading…
x
Reference in New Issue
Block a user