aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_permissions.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-12-02 13:19:40 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-12-02 13:19:40 +0000
commit7ad986c37e15bc51f5dc2cb42a4fa6445fde51e3 (patch)
treeb2bbf1e855f1c185f76972777cef56b29e5e10d2 /phpBB/includes/acp/acp_permissions.php
parentde1c536548c5b41d33a16f3afe12ba67000d7210 (diff)
downloadforums-7ad986c37e15bc51f5dc2cb42a4fa6445fde51e3.tar
forums-7ad986c37e15bc51f5dc2cb42a4fa6445fde51e3.tar.gz
forums-7ad986c37e15bc51f5dc2cb42a4fa6445fde51e3.tar.bz2
forums-7ad986c37e15bc51f5dc2cb42a4fa6445fde51e3.tar.xz
forums-7ad986c37e15bc51f5dc2cb42a4fa6445fde51e3.zip
- a bunch of fixes
- added todos to the updater to make sure i do not forget. :) git-svn-id: file:///svn/phpbb/trunk@6698 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_permissions.php')
-rw-r--r--phpBB/includes/acp/acp_permissions.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_permissions.php b/phpBB/includes/acp/acp_permissions.php
index 5354d70f72..8b611ffef1 100644
--- a/phpBB/includes/acp/acp_permissions.php
+++ b/phpBB/includes/acp/acp_permissions.php
@@ -1064,7 +1064,7 @@ class acp_permissions
$sql_permission_option = "AND o.auth_option LIKE '" . $db->sql_escape($permission_type) . "%'";
$sql = $db->sql_build_query('SELECT_DISTINCT', array(
- 'SELECT' => 'u.username, u.user_regdate, u.user_id',
+ 'SELECT' => 'u.username, u.username_clean, u.user_regdate, u.user_id',
'FROM' => array(
USERS_TABLE => 'u',
@@ -1084,7 +1084,7 @@ class acp_permissions
$sql_forum_id
AND u.user_id = a.user_id",
- 'ORDER_BY' => 'u.username, u.user_regdate ASC'
+ 'ORDER_BY' => 'u.username_clean, u.user_regdate ASC'
));
$result = $db->sql_query($sql);