makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Find and display colliding usernames correctly when converting from one database to another (Bug #23925)

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8489 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Nils Adermann 2008-04-03 14:04:10 +00:00
parent d85b3ae528
commit 261b310b0d
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/docs/CHANGELOG.html
View file

@ -149,6 +149,7 @@
<li>[Sec] Only allow searching by email address in memberlist for users having the a_user permission (reported by evil&lt;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>

4
phpBB/install/convertors/functions_phpbb20.php
View file

@ -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 = '';