diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:38 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:38 +0100 |
| commit | 5324afeffd84810db3cac6e1d8dfec3678ab99c6 (patch) | |
| tree | 35c93b2056006be40f9e4660cedd52d45eb6d342 /phpBB/install/convertors | |
| parent | 0434ccf303e1313e0b157012da9fb8ded26e886b (diff) | |
| parent | 4ff33f5d49597e5168223cf17b0d595b4df3b8da (diff) | |
| download | forums-5324afeffd84810db3cac6e1d8dfec3678ab99c6.tar forums-5324afeffd84810db3cac6e1d8dfec3678ab99c6.tar.gz forums-5324afeffd84810db3cac6e1d8dfec3678ab99c6.tar.bz2 forums-5324afeffd84810db3cac6e1d8dfec3678ab99c6.tar.xz forums-5324afeffd84810db3cac6e1d8dfec3678ab99c6.zip | |
Merge commit 'release-3.0.1'
Diffstat (limited to 'phpBB/install/convertors')
| -rw-r--r-- | phpBB/install/convertors/convert_phpbb20.php | 4 | ||||
| -rw-r--r-- | phpBB/install/convertors/functions_phpbb20.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 4fe59d5a0a..ae7c9959f1 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -31,8 +31,8 @@ unset($dbpasswd); */ $convertor_data = array( 'forum_name' => 'phpBB 2.0.x', - 'version' => '1.0.0', - 'phpbb_version' => '3.0.0', + 'version' => '1.0.1', + 'phpbb_version' => '3.0.1', 'author' => '<a href="http://www.phpbb.com/">phpBB Group</a>', 'dbms' => $dbms, 'dbhost' => $dbhost, 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 = ''; |