aboutsummaryrefslogtreecommitdiffstats
path: root/admin/group_list.php
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2014-03-28 13:26:30 +0000
committerplegall <plg@piwigo.org>2014-03-28 13:26:30 +0000
commit393b1b38ef0b639357d4c9d6df9eed8362da8f8a (patch)
treef157180715dff3a57a2f7a791393e87f37101598 /admin/group_list.php
parent4b7102bd45e3d8394ac02af3ef49ec9b416bc80b (diff)
merge r27996 from branch 2.6 to trunk
bug 3065 fixed: avoid SQL errors with external authentication git-svn-id: http://piwigo.org/svn/trunk@27997 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/group_list.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/group_list.php b/admin/group_list.php
index 4912458f7..5c53a8b1f 100644
--- a/admin/group_list.php
+++ b/admin/group_list.php
@@ -394,7 +394,7 @@ $toggle_is_default_url = $admin_url.'group_list&amp;toggle_is_default=';
while ($row = pwg_db_fetch_assoc($result))
{
$query = '
-SELECT username
+SELECT u.'. $conf['user_fields']['username'].' AS username
FROM '.USERS_TABLE.' AS u
INNER JOIN '.USER_GROUP_TABLE.' AS ug
ON u.'.$conf['user_fields']['id'].' = ug.user_id