diff options
| author | David M <davidmj@users.sourceforge.net> | 2006-03-22 02:17:34 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2006-03-22 02:17:34 +0000 |
| commit | 2b24cdb40f0e08b0bf3801800203f96263d02e67 (patch) | |
| tree | b63f2418e4aa86d1f6ce939125079666458734b0 | |
| parent | 64e72f98d4593929f00ced22ba7517e89a67330b (diff) | |
| download | forums-2b24cdb40f0e08b0bf3801800203f96263d02e67.tar forums-2b24cdb40f0e08b0bf3801800203f96263d02e67.tar.gz forums-2b24cdb40f0e08b0bf3801800203f96263d02e67.tar.bz2 forums-2b24cdb40f0e08b0bf3801800203f96263d02e67.tar.xz forums-2b24cdb40f0e08b0bf3801800203f96263d02e67.zip | |
- Bug 1192
git-svn-id: file:///svn/phpbb/trunk@5689 89ea8834-ac86-4346-8a33-228a782c2dd0
| -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 99143387d6..b07388c4e8 100644 --- a/phpBB/includes/acp/acp_permissions.php +++ b/phpBB/includes/acp/acp_permissions.php @@ -306,7 +306,7 @@ class acp_permissions $sql_permission_option = "AND o.auth_option LIKE '" . $db->sql_escape($permission_type) . "%'"; $sql = 'SELECT DISTINCT u.user_id, u.username - FROM (' . USERS_TABLE . ' u, ' . ACL_USERS_TABLE . ' a, ' . ACL_OPTIONS_TABLE . ' o) + 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) $sql_permission_option @@ -325,7 +325,7 @@ class acp_permissions $db->sql_freeresult($result); $sql = 'SELECT DISTINCT g.group_id, g.group_name, g.group_type - FROM (' . GROUPS_TABLE . ' g, ' . ACL_GROUPS_TABLE . ' a, ' . ACL_OPTIONS_TABLE . ' o) + 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) $sql_permission_option |