diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-03-27 16:39:19 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-03-27 16:39:19 +0000 |
| commit | f5467430bd98059530dc33e7bcf1e18b64cb8c4c (patch) | |
| tree | 36f51223b72edecc6ab531f9d670fa71a341d379 /phpBB/includes/functions_user.php | |
| parent | 3e6fbb1c6d07be14ee15df61838807be7a59b86e (diff) | |
| download | forums-f5467430bd98059530dc33e7bcf1e18b64cb8c4c.tar forums-f5467430bd98059530dc33e7bcf1e18b64cb8c4c.tar.gz forums-f5467430bd98059530dc33e7bcf1e18b64cb8c4c.tar.bz2 forums-f5467430bd98059530dc33e7bcf1e18b64cb8c4c.tar.xz forums-f5467430bd98059530dc33e7bcf1e18b64cb8c4c.zip | |
speed up group deletion and correctly display user parameter if group membership changed in acp -> users -> groups
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9409 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_user.php')
| -rw-r--r-- | phpBB/includes/functions_user.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 6a45011977..027db39751 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -2807,13 +2807,14 @@ function group_user_del($group_id, $user_id_ary = false, $username_ary = false, $temp_ary = array(); while ($row = $db->sql_fetchrow($result)) { - if ($default_groups[$row['user_id']] == $group_id && (!isset($temp_ary[$row['user_id']]) || array_search($row['group_name'], $group_order) < $temp_ary[$row['user_id']])) + if ($default_groups[$row['user_id']] == $group_id && (!isset($temp_ary[$row['user_id']]) || $group_order_id[$row['group_name']] < $temp_ary[$row['user_id']])) { $temp_ary[$row['user_id']] = $row['group_id']; } } $db->sql_freeresult($result); + // sql_where_ary holds the new default groups and their users $sql_where_ary = array(); foreach ($temp_ary as $uid => $gid) { @@ -2825,7 +2826,7 @@ function group_user_del($group_id, $user_id_ary = false, $username_ary = false, { if (isset($sql_where_ary[$gid]) && sizeof($sql_where_ary[$gid])) { - remove_default_rank($group_id, $sql_where_ary[$gid]); + remove_default_rank($gid, $sql_where_ary[$gid]); remove_default_avatar($group_id, $sql_where_ary[$gid]); group_set_user_default($gid, $sql_where_ary[$gid], $default_data_ary); } |