diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-06-19 09:51:50 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-06-19 09:51:50 +0000 |
| commit | d7d96223e7bae7cd60b13c6e7896d95838c3633c (patch) | |
| tree | 7040375c914b885a97b0787727535737f4193014 /phpBB/includes/acp/acp_permissions.php | |
| parent | ac1fd3c740bf396e27e882877b94ae246caedac6 (diff) | |
| download | forums-d7d96223e7bae7cd60b13c6e7896d95838c3633c.tar forums-d7d96223e7bae7cd60b13c6e7896d95838c3633c.tar.gz forums-d7d96223e7bae7cd60b13c6e7896d95838c3633c.tar.bz2 forums-d7d96223e7bae7cd60b13c6e7896d95838c3633c.tar.xz forums-d7d96223e7bae7cd60b13c6e7896d95838c3633c.zip | |
- Display coloured usernames in ACP groups management screens
- Changed behaviour of group_create() function to support specifying additional group columns
- New groups option to excempt group leaders from group permissions
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9625 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_permissions.php')
| -rw-r--r-- | phpBB/includes/acp/acp_permissions.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_permissions.php b/phpBB/includes/acp/acp_permissions.php index 164970b5d5..1dab6febdd 100644 --- a/phpBB/includes/acp/acp_permissions.php +++ b/phpBB/includes/acp/acp_permissions.php @@ -963,6 +963,7 @@ class acp_permissions LEFT JOIN ' . USER_GROUP_TABLE . ' ug ON (ug.group_id = g.group_id) WHERE ug.user_id = ' . $user_id . ' AND ug.user_pending = 0 + AND NOT (ug.group_leader = 1 AND g.group_skip_auth = 1) ORDER BY g.group_type DESC, g.group_id DESC'; $result = $db->sql_query($sql); |