diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-03-19 14:27:12 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-03-19 14:27:12 +0000 |
| commit | bcabff8a1fe82452366b6f278782fd284effece4 (patch) | |
| tree | 498ad79e0b87e54833dc2c114d41cc616c9753c7 /phpBB/includes | |
| parent | 8f9b90983fac14054a4f14f047b83a9e1c8324d7 (diff) | |
| download | forums-bcabff8a1fe82452366b6f278782fd284effece4.tar forums-bcabff8a1fe82452366b6f278782fd284effece4.tar.gz forums-bcabff8a1fe82452366b6f278782fd284effece4.tar.bz2 forums-bcabff8a1fe82452366b6f278782fd284effece4.tar.xz forums-bcabff8a1fe82452366b6f278782fd284effece4.zip | |
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
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions_user.php | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 8006cb5fd3..108e884abd 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -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); |