Merge branch 'wip-MDL-43283-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 9 Jan 2014 22:07:19 +0000 (23:07 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 9 Jan 2014 22:07:19 +0000 (23:07 +0100)
mod/chat/lib.php

index e3ad93d..12944c6 100644 (file)
@@ -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;