diff options
author | Henry Sudhof <kellanved@phpbb.com> | 2007-05-21 12:15:16 +0000 |
---|---|---|
committer | Henry Sudhof <kellanved@phpbb.com> | 2007-05-21 12:15:16 +0000 |
commit | beeb2281cd3c4c20ae960a1ebbe19e0d0b5a4b92 (patch) | |
tree | ae20785642dccc69c592bc3998fb6c590eecbb5e /phpBB/install/convertors | |
parent | b7b68bff5d02e0070f4f4cc6d9f28dd55c8b06c8 (diff) | |
download | forums-beeb2281cd3c4c20ae960a1ebbe19e0d0b5a4b92.tar forums-beeb2281cd3c4c20ae960a1ebbe19e0d0b5a4b92.tar.gz forums-beeb2281cd3c4c20ae960a1ebbe19e0d0b5a4b92.tar.bz2 forums-beeb2281cd3c4c20ae960a1ebbe19e0d0b5a4b92.tar.xz forums-beeb2281cd3c4c20ae960a1ebbe19e0d0b5a4b92.zip |
99 bugs on the wall ...
#11339
#11283
... 97 bugs on the wall ...
git-svn-id: file:///svn/phpbb/trunk@7658 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install/convertors')
-rw-r--r-- | phpBB/install/convertors/functions_phpbb20.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php index 6788ecd900..a350ee8f4e 100644 --- a/phpBB/install/convertors/functions_phpbb20.php +++ b/phpBB/install/convertors/functions_phpbb20.php @@ -533,6 +533,14 @@ function phpbb_convert_authentication($mode) ORDER BY user_regdate ASC"; $result = $src_db->sql_query($sql); + + $sql = 'SELECT group_id + FROM ' . GROUPS_TABLE . " + WHERE group_name = '" . $db->sql_escape('BOTS') . "'"; + $result = $db->sql_query($sql); + $bot_group_id = (int) $db->sql_fetchfield('group_id'); + $db->sql_freeresult($result); + while ($row = $src_db->sql_fetchrow($result)) { $user_id = (int) phpbb_user_id($row['user_id']); @@ -710,7 +718,7 @@ function phpbb_convert_authentication($mode) if ($mode == 'start') { user_group_auth('guests', 'SELECT user_id, {GUESTS} FROM ' . USERS_TABLE . ' WHERE user_id = ' . ANONYMOUS, false); - user_group_auth('registered', 'SELECT user_id, {REGISTERED} FROM ' . USERS_TABLE . ' WHERE user_id <> ' . ANONYMOUS, false); + user_group_auth('registered', 'SELECT user_id, {REGISTERED} FROM ' . USERS_TABLE . ' WHERE user_id <> ' . ANONYMOUS . " AND group_id <> $bot_group_id", false); // Selecting from old table if (!empty($config['increment_user_id'])) |