diff options
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/install/convertors/functions_phpbb20.php | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 9a94b71ed0..dd4fd3b90a 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -149,6 +149,7 @@ <li>[Sec] Only allow searching by email address in memberlist for users having the a_user permission (reported by evil<3)</li> <li>[Sec] Limit private message attachments to be viewable only by the recipient(s)/sender (Report #s23535) - reported by AlleyKat</li> <li>[Sec] Check for non-empty config.php within style.php (Report #s24575) - reported by bantu</li> + <li>[Fix] Find and display colliding usernames correctly when converting from one database to another (Bug #23925)</li> </ul> <a name="v30rc8"></a><h3>1.i. Changes since 3.0.RC8</h3> 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 = ''; |