aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenry Sudhof <kellanved@phpbb.com>2007-05-22 14:08:48 +0000
committerHenry Sudhof <kellanved@phpbb.com>2007-05-22 14:08:48 +0000
commit648399cff3da5528dd747e7bbf0c57b0e7552da9 (patch)
treefacd8b62b6aeccc48ca128684dda22c4b690d8fd
parent34f183217b13f992f894f20b84001af080a8041b (diff)
downloadforums-648399cff3da5528dd747e7bbf0c57b0e7552da9.tar
forums-648399cff3da5528dd747e7bbf0c57b0e7552da9.tar.gz
forums-648399cff3da5528dd747e7bbf0c57b0e7552da9.tar.bz2
forums-648399cff3da5528dd747e7bbf0c57b0e7552da9.tar.xz
forums-648399cff3da5528dd747e7bbf0c57b0e7552da9.zip
Changed the way we assemble user_group entries during cross-DB conversion. The old way produced many invalid entries for admins.
git-svn-id: file:///svn/phpbb/trunk@7662 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/includes/functions_convert.php15
1 files changed, 3 insertions, 12 deletions
diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php
index 22323a803a..98c1452c23 100644
--- a/phpBB/includes/functions_convert.php
+++ b/phpBB/includes/functions_convert.php
@@ -1137,21 +1137,12 @@ function user_group_auth($group, $select_query, $use_src_db)
}
else
{
- $result = $src_db->sql_query(str_replace('{' . strtoupper($group) . '}', $group_id . ', 0', $select_query));
+ $result = $src_db->sql_query(str_replace('{' . strtoupper($group) . '}', $group_id . ' ', $select_query));
while ($row = $src_db->sql_fetchrow($result))
{
- // make sure it's exactly 3 ints that were returned
- $data = array();
- reset($row);
- for ($i = 0; $i < 3; $i++)
- {
- $data[] = (int) current($row);
- next($row);
- }
-
// this might become quite a lot of INSERTS unfortunately
- $sql = 'INSERT INTO ' . USER_GROUP_TABLE . ' (user_id, group_id, user_pending)
- VALUES (' . implode(', ', $data) . ')';
+ $sql = 'INSERT INTO ' . USER_GROUP_TABLE . " (user_id, group_id, user_pending)
+ VALUES ({$row['user_id']}, $group_id, 0)";
$db->sql_query($sql);
}
$src_db->sql_freeresult($result);