diff options
| author | Nils Adermann <naderman@naderman.de> | 2008-04-03 14:04:10 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2008-04-03 14:04:10 +0000 |
| commit | 261b310b0d3e9024e82ede7653a4baee6f83315f (patch) | |
| tree | 25e79e1c6aff8e28c7e70fbc164c8ac9f0e28e5c /phpBB/install/convertors | |
| parent | d85b3ae528d8417f07af5bac571998ce3564d10f (diff) | |
| download | forums-261b310b0d3e9024e82ede7653a4baee6f83315f.tar forums-261b310b0d3e9024e82ede7653a4baee6f83315f.tar.gz forums-261b310b0d3e9024e82ede7653a4baee6f83315f.tar.bz2 forums-261b310b0d3e9024e82ede7653a4baee6f83315f.tar.xz forums-261b310b0d3e9024e82ede7653a4baee6f83315f.zip | |
- Find and display colliding usernames correctly when converting from one database to another (Bug #23925)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8489 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install/convertors')
| -rw-r--r-- | phpBB/install/convertors/functions_phpbb20.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php index c4d421efee..c69574c565 100644 --- a/phpBB/install/convertors/functions_phpbb20.php +++ b/phpBB/install/convertors/functions_phpbb20.php @@ -1856,7 +1856,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']])) @@ -1864,7 +1864,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 = ''; |