Merge branch 'wip-MDL-43283-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE

2014-01-09 23:07:52 +01:00
parent 5cf42ac843 61d35d7b9d
commit d9aa7cbb6f
1 changed files with 1 additions and 1 deletions
@@ -367,7 +367,7 @@ function chat_print_recent_activity($course, $viewfullnames, $timestart) {
                                                  JOIN {chat_users} chu ON chu.chatid = ch.id
                                                  JOIN {user} u         ON u.id = chu.userid
                                                 WHERE cm.id = :cmid $timeout $groupselect
-                                              GROUP BY u.id, u.firstname, u.lastname, u.email, u.picture", $params)) {
+                                              GROUP BY $userfields", $params)) {
            }

            $link = $CFG->wwwroot.'/mod/chat/view.php?id='.$cm->id;