diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-03-28 14:04:55 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-03-28 14:04:55 +0000 |
| commit | 20e6dbb389b0eef201d192367d54ce3deac03c50 (patch) | |
| tree | 260844fb25e52ed49587b1e7145b7c9749231ef2 /phpBB/includes/acp/acp_permissions.php | |
| parent | 8936be16287cdcf5d86a5d46cb212c1e7cab780b (diff) | |
| download | forums-20e6dbb389b0eef201d192367d54ce3deac03c50.tar forums-20e6dbb389b0eef201d192367d54ce3deac03c50.tar.gz forums-20e6dbb389b0eef201d192367d54ce3deac03c50.tar.bz2 forums-20e6dbb389b0eef201d192367d54ce3deac03c50.tar.xz forums-20e6dbb389b0eef201d192367d54ce3deac03c50.zip | |
fixing some bugs
git-svn-id: file:///svn/phpbb/trunk@5742 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_permissions.php')
| -rw-r--r-- | phpBB/includes/acp/acp_permissions.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_permissions.php b/phpBB/includes/acp/acp_permissions.php index 434ccb5b82..b146e09a91 100644 --- a/phpBB/includes/acp/acp_permissions.php +++ b/phpBB/includes/acp/acp_permissions.php @@ -322,7 +322,7 @@ class acp_permissions $sql_forum_id = ($permission_scope == 'global') ? 'AND a.forum_id = 0' : ((sizeof($forum_id)) ? 'AND a.forum_id IN (' . implode(', ', $forum_id) . ')' : 'AND a.forum_id <> 0'); $sql_permission_option = "AND o.auth_option LIKE '" . $db->sql_escape($permission_type) . "%'"; - $sql = 'SELECT DISTINCT u.user_id, u.username + $sql = 'SELECT DISTINCT u.username, u.user_regdate, u.user_id FROM (' . USERS_TABLE . ' u, ' . ACL_OPTIONS_TABLE . ' o, ' . ACL_USERS_TABLE . ' a) LEFT JOIN ' . ACL_ROLES_DATA_TABLE . " r ON (a.auth_role_id = r.role_id) WHERE (a.auth_option_id = o.auth_option_id OR r.auth_option_id = o.auth_option_id) @@ -341,7 +341,7 @@ class acp_permissions } $db->sql_freeresult($result); - $sql = 'SELECT DISTINCT g.group_id, g.group_name, g.group_type + $sql = 'SELECT DISTINCT g.group_type, g.group_name, g.group_id FROM (' . GROUPS_TABLE . ' g, ' . ACL_OPTIONS_TABLE . ' o, ' . ACL_GROUPS_TABLE . ' a) LEFT JOIN ' . ACL_ROLES_DATA_TABLE . " r ON (a.auth_role_id = r.role_id) WHERE (a.auth_option_id = o.auth_option_id OR r.auth_option_id = o.auth_option_id) |