diff options
| author | Nils Adermann <naderman@naderman.de> | 2008-04-03 14:06:57 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2008-04-03 14:06:57 +0000 |
| commit | 82454165c31d1e67146fa7c548866067b1138318 (patch) | |
| tree | 93dfab43a01f51834f42d6661d752a3a4603c95f | |
| parent | 4879a7a075deb378a594cb9001dbf0ce36412519 (diff) | |
| download | forums-82454165c31d1e67146fa7c548866067b1138318.tar forums-82454165c31d1e67146fa7c548866067b1138318.tar.gz forums-82454165c31d1e67146fa7c548866067b1138318.tar.bz2 forums-82454165c31d1e67146fa7c548866067b1138318.tar.xz forums-82454165c31d1e67146fa7c548866067b1138318.zip | |
merging r8489 into trunk
git-svn-id: file:///svn/phpbb/trunk@8490 89ea8834-ac86-4346-8a33-228a782c2dd0
| -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 061abba0a0..b9d3677e34 100644 --- a/phpBB/install/convertors/functions_phpbb20.php +++ b/phpBB/install/convertors/functions_phpbb20.php @@ -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 = ''; |