diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-05-12 20:52:58 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-05-12 20:52:58 +0000 |
| commit | a8d99f2228cc042c8410553f5f3ec375148552f5 (patch) | |
| tree | 11ccbd184cbc222775a08852d633d74ced7b2695 /phpBB/includes/acp/acp_permissions.php | |
| parent | 7dd067bf5a532e4c30908cca24449274a4863326 (diff) | |
| download | forums-a8d99f2228cc042c8410553f5f3ec375148552f5.tar forums-a8d99f2228cc042c8410553f5f3ec375148552f5.tar.gz forums-a8d99f2228cc042c8410553f5f3ec375148552f5.tar.bz2 forums-a8d99f2228cc042c8410553f5f3ec375148552f5.tar.xz forums-a8d99f2228cc042c8410553f5f3ec375148552f5.zip | |
- introduce new function build_url to easily build a valid url from the user->page object as well as optionally removing certain keys
- changed attachment config to utilize the config build methods
- cleaned up posting.php
- the submit/delete_post functions are now usable (functions_posting.php)
- adjusted header icons (transparency)
- a bunch of fixes for mssql
- bug fixes
git-svn-id: file:///svn/phpbb/trunk@5902 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_permissions.php')
| -rw-r--r-- | phpBB/includes/acp/acp_permissions.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/acp/acp_permissions.php b/phpBB/includes/acp/acp_permissions.php index 1059629863..c794c159b9 100644 --- a/phpBB/includes/acp/acp_permissions.php +++ b/phpBB/includes/acp/acp_permissions.php @@ -384,7 +384,7 @@ class acp_permissions 'FROM' => array( GROUPS_TABLE => 'g', ACL_OPTIONS_TABLE => 'o', - ACL_USERS_TABLE => 'a' + ACL_GROUPS_TABLE => 'a' ), 'LEFT_JOIN' => array( @@ -395,9 +395,9 @@ class acp_permissions ), 'WHERE' => "(a.auth_option_id = o.auth_option_id OR r.auth_option_id = o.auth_option_id) - $sql_permission_option - $sql_forum_id - AND g.group_id = a.group_id", + $sql_permission_option + $sql_forum_id + AND g.group_id = a.group_id", 'ORDER_BY' => 'g.group_type DESC, g.group_name ASC' )); |