mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-27 21:58:52 +00:00
do not use coppa group as failover if disabled (remove user from group)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9397 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
8f9b90983f
commit
bcabff8a1f
1 changed files with 9 additions and 2 deletions
|
@ -2734,9 +2734,16 @@ function group_user_add($group_id, $user_id_ary = false, $username_ary = false,
|
|||
*/
|
||||
function group_user_del($group_id, $user_id_ary = false, $username_ary = false, $group_name = false)
|
||||
{
|
||||
global $db, $auth;
|
||||
global $db, $auth, $config;
|
||||
|
||||
$group_order = array('ADMINISTRATORS', 'GLOBAL_MODERATORS', 'REGISTERED_COPPA', 'REGISTERED', 'BOTS', 'GUESTS');
|
||||
if ($config['coppa_enable'])
|
||||
{
|
||||
$group_order = array('ADMINISTRATORS', 'GLOBAL_MODERATORS', 'REGISTERED_COPPA', 'REGISTERED', 'BOTS', 'GUESTS');
|
||||
}
|
||||
else
|
||||
{
|
||||
$group_order = array('ADMINISTRATORS', 'GLOBAL_MODERATORS', 'REGISTERED', 'BOTS', 'GUESTS');
|
||||
}
|
||||
|
||||
// We need both username and user_id info
|
||||
$result = user_get_id_name($user_id_ary, $username_ary);
|
||||
|
|
Loading…
Add table
Reference in a new issue