merging r8489 into trunk

git-svn-id: file:///svn/phpbb/trunk@8490 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Nils Adermann 2008-04-03 14:06:57 +00:00
parent 4879a7a075
commit 82454165c3

View file

@ -1835,7 +1835,7 @@ function phpbb_check_username_collisions()
$result = $src_db->sql_query($sql); $result = $src_db->sql_query($sql);
$colliding_users = array(); $colliding_users = array();
while ($row = $db->sql_fetchrow($result)) while ($row = $src_db->sql_fetchrow($result))
{ {
$row['user_id'] = (int) $row['user_id']; $row['user_id'] = (int) $row['user_id'];
if (isset($colliding_user_ids[$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; $colliding_users[$colliding_user_ids[$row['user_id']]][] = $row;
} }
} }
$db->sql_freeresult($result); $src_db->sql_freeresult($result);
unset($colliding_user_ids); unset($colliding_user_ids);
$list = ''; $list = '';