Merge branch 'wip-mdl-43765-m26' of https://github.com/rajeshtaneja/moodle into MOODLE_26_STABLE

2014-01-27 19:23:35 +01:00
parent 06b2987aad 81efab0cbb
commit 408b3ee93f
1 changed files with 2 additions and 2 deletions
@@ -251,8 +251,8 @@ if (!empty($instanceid) && !empty($roleid)) {
        $groupsql = "JOIN {groups_members} gm ON (gm.userid = u.id AND gm.groupid = :groupid)";
        $params['groupid'] = $currentgroup;
    }
-
-    $sql = "SELECT ra.userid, u.firstname, u.lastname, u.idnumber, l.actioncount AS count
+    $usernamefields = get_all_user_name_fields(true, 'u');
+    $sql = "SELECT ra.userid, $usernamefields, u.idnumber, l.actioncount AS count
            FROM (SELECT * FROM {role_assignments} WHERE contextid $relatedctxsql AND roleid = :roleid ) ra
            JOIN {user} u ON u.id = ra.userid
            $groupsql