diff options
author | Meik Sievertsen <acydburn@phpbb.com> | 2009-10-06 13:40:01 +0000 |
---|---|---|
committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-10-06 13:40:01 +0000 |
commit | 51d173ff1e6d3764be4701b92ecfd68007ad1c81 (patch) | |
tree | bf744132e028c3ee692ea8239fcb340f4a533adb /phpBB/includes/functions_user.php | |
parent | 8243e9a3728feca2356add9684f91451bf28a43f (diff) | |
download | forums-51d173ff1e6d3764be4701b92ecfd68007ad1c81.tar forums-51d173ff1e6d3764be4701b92ecfd68007ad1c81.tar.gz forums-51d173ff1e6d3764be4701b92ecfd68007ad1c81.tar.bz2 forums-51d173ff1e6d3764be4701b92ecfd68007ad1c81.tar.xz forums-51d173ff1e6d3764be4701b92ecfd68007ad1c81.zip |
(a little test for later merges)
reintegrate branch into trunk (r10214)
git-svn-id: file:///svn/phpbb/trunk@10215 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_user.php')
-rw-r--r-- | phpBB/includes/functions_user.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 7255d138ab..21e82030ee 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -2832,11 +2832,11 @@ function group_user_del($group_id, $user_id_ary = false, $username_ary = false, if ($config['coppa_enable']) { - $group_order = array('ADMINISTRATORS', 'GLOBAL_MODERATORS', 'REGISTERED_COPPA', 'REGISTERED', 'BOTS', 'GUESTS'); + $group_order = array('ADMINISTRATORS', 'GLOBAL_MODERATORS', 'NEWLY_REGISTERED', 'REGISTERED_COPPA', 'REGISTERED', 'BOTS', 'GUESTS'); } else { - $group_order = array('ADMINISTRATORS', 'GLOBAL_MODERATORS', 'REGISTERED', 'BOTS', 'GUESTS'); + $group_order = array('ADMINISTRATORS', 'GLOBAL_MODERATORS', 'NEWLY_REGISTERED', 'REGISTERED', 'BOTS', 'GUESTS'); } // We need both username and user_id info |