mirror of
https://github.com/moodle/moodle.git
synced 2025-08-05 08:56:36 +02:00
"MDL-14651, fixed chat_format_userlist"
This commit is contained in:
parent
2698e9c1ac
commit
ff0e58c8ae
2 changed files with 2 additions and 11 deletions
|
@ -54,16 +54,7 @@ header('X-Powered-By: MOODLE-Chat-V2');
|
||||||
|
|
||||||
switch ($action) {
|
switch ($action) {
|
||||||
case 'init':
|
case 'init':
|
||||||
if($CFG->chat_use_cache){
|
$users = chat_get_users($chatuser->chatid, $chatuser->groupid, $cm->groupingid);
|
||||||
$cache = new file_cache();
|
|
||||||
$users = $cache->get('user');
|
|
||||||
if(empty($users)) {
|
|
||||||
$users = chat_get_users($chatuser->chatid, $chatuser->groupid, $cm->groupingid);
|
|
||||||
$cache->set('user', $users);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
$users = chat_get_users($chatuser->chatid, $chatuser->groupid, $cm->groupingid);
|
|
||||||
}
|
|
||||||
$users = chat_format_userlist($users, $course);
|
$users = chat_format_userlist($users, $course);
|
||||||
$response['users'] = $users;
|
$response['users'] = $users;
|
||||||
echo json_encode($response);
|
echo json_encode($response);
|
||||||
|
|
|
@ -922,7 +922,7 @@ function chat_format_userlist($users, $course) {
|
||||||
foreach($users as $user){
|
foreach($users as $user){
|
||||||
$item = array();
|
$item = array();
|
||||||
$item['name'] = fullname($user);
|
$item['name'] = fullname($user);
|
||||||
$item['url'] = $CFG->wwwroot.'/user/view.php?id='.$v->id.'&course='.$course->id;
|
$item['url'] = $CFG->wwwroot.'/user/view.php?id='.$user->id.'&course='.$course->id;
|
||||||
$item['picture'] = $OUTPUT->user_picture(moodle_user_picture::make($user, $COURSE->id));
|
$item['picture'] = $OUTPUT->user_picture(moodle_user_picture::make($user, $COURSE->id));
|
||||||
$item['id'] = $user->id;
|
$item['id'] = $user->id;
|
||||||
$result[] = $item;
|
$result[] = $item;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue