Merge branch 'MDL-42592_master' of https://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Nov 2013 14:27:49 +0000 (22:27 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Nov 2013 14:27:49 +0000 (22:27 +0800)
mod/chat/lib.php

index c51d33e..e3ad93d 100644 (file)
@@ -360,7 +360,8 @@ function chat_print_recent_activity($course, $viewfullnames, $timestart) {
                 $groupselect = "";
             }
 
-            if (!$users = $DB->get_records_sql("SELECT u.id, u.firstname, u.lastname, u.email, u.picture
+            $userfields = user_picture::fields('u');
+            if (!$users = $DB->get_records_sql("SELECT $userfields
                                                   FROM {course_modules} cm
                                                   JOIN {chat} ch        ON ch.id = cm.instance
                                                   JOIN {chat_users} chu ON chu.chatid = ch.id