diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-04-11 14:21:45 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-04-11 14:21:45 +0000 |
| commit | dbae1db24c9bc264945d841b76642c5d14a35a63 (patch) | |
| tree | f02d5f54c53ea77dd55f168aa6a578885043bc47 /phpBB/includes/acp/acp_permissions.php | |
| parent | 82454165c31d1e67146fa7c548866067b1138318 (diff) | |
| download | forums-dbae1db24c9bc264945d841b76642c5d14a35a63.tar forums-dbae1db24c9bc264945d841b76642c5d14a35a63.tar.gz forums-dbae1db24c9bc264945d841b76642c5d14a35a63.tar.bz2 forums-dbae1db24c9bc264945d841b76642c5d14a35a63.tar.xz forums-dbae1db24c9bc264945d841b76642c5d14a35a63.zip | |
merge some changes/fixes
henry: is your viewonline fix/change missing? ;)
git-svn-id: file:///svn/phpbb/trunk@8503 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_permissions.php')
| -rw-r--r-- | phpBB/includes/acp/acp_permissions.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_permissions.php b/phpBB/includes/acp/acp_permissions.php index a9e64b74ae..9240db271c 100644 --- a/phpBB/includes/acp/acp_permissions.php +++ b/phpBB/includes/acp/acp_permissions.php @@ -1156,7 +1156,7 @@ class acp_permissions } // Not ideal, due to the filesort, non-use of indexes, etc. - $sql = 'SELECT DISTINCT u.user_id, u.username + $sql = 'SELECT DISTINCT u.user_id, u.username, u.username_clean, u.user_regdate FROM ' . USERS_TABLE . ' u, ' . ACL_USERS_TABLE . " a WHERE u.user_id = a.user_id $sql_forum_id |