Ignore:
Timestamp:
Mar 28, 2014, 2:26:30 PM (10 years ago)
Author:
plg
Message:

merge r27996 from branch 2.6 to trunk

bug 3065 fixed: avoid SQL errors with external authentication

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/admin/group_list.php

    r26461 r27997  
    395395{
    396396  $query = '
    397 SELECT username
     397SELECT u.'. $conf['user_fields']['username'].' AS username
    398398  FROM '.USERS_TABLE.' AS u
    399399  INNER JOIN '.USER_GROUP_TABLE.' AS ug
Note: See TracChangeset for help on using the changeset viewer.