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/functions_admin.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/functions_admin.php')
| -rw-r--r-- | phpBB/includes/functions_admin.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index 52a7017e09..f9a072d1a8 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -2137,12 +2137,13 @@ function cache_moderators() // Remove users who have group memberships with DENY moderator permissions $sql = $db->sql_build_query('SELECT', array( - 'SELECT' => 'a.forum_id, ug.user_id', + 'SELECT' => 'a.forum_id, ug.user_id, g.group_id', 'FROM' => array( ACL_OPTIONS_TABLE => 'o', USER_GROUP_TABLE => 'ug', - ACL_GROUPS_TABLE => 'a' + ACL_GROUPS_TABLE => 'a', + GROUPS_TABLE => 'g', ), 'LEFT_JOIN' => array( @@ -2156,6 +2157,8 @@ function cache_moderators() AND ((a.auth_setting = ' . ACL_NEVER . ' AND r.auth_setting IS NULL) OR r.auth_setting = ' . ACL_NEVER . ') AND a.group_id = ug.group_id + AND g.ground_id = ug.group_id + AND NOT (ug.group_leader = 1 AND g.group_skip_auth = 1) AND ' . $db->sql_in_set('ug.user_id', $ug_id_ary) . " AND ug.user_pending = 0 AND o.auth_option " . $db->sql_like_expression('m_' . $db->any_char), |