Merge branch 'MDL-46513_master' of git://github.com/markn86/moodle

This commit is contained in:
Jun Pataleta 2018-06-06 15:59:21 +08:00 committed by Eloy Lafuente (stronk7)
commit 959d5fadc6

View File

@ -82,6 +82,7 @@ $strdeletesession = get_string('deletesession', 'chat');
$navlinks = array();
$canexportsess = has_capability('mod/chat:exportsession', $context);
$canviewfullnames = has_capability('moodle/site:viewfullnames', $context);
// Print a session if one has been specified.
@ -213,7 +214,7 @@ foreach ($sessions as $session) {
foreach ($session->sessionusers as $sessionuser => $usermessagecount) {
if ($user = $DB->get_record('user', array('id' => $sessionuser))) {
$OUTPUT->user_picture($user, array('courseid' => $course->id));
echo ' '.fullname($user, true); // XXX TODO use capability instead of true.
echo ' ' . fullname($user, $canviewfullnames);
echo "&nbsp;($usermessagecount)<br />";
}
}