"MDL-14651, fixed chat_format_userlist"

diff --git a/mod/chat/chat_ajax.php b/mod/chat/chat_ajax.php
index 0112f634fd67a4879df5eaf364c89f9b0b87f3fc..0daa6f6e3a479c0c56ad33855e88b40a6258065d 100644 (file)
--- a/mod/chat/chat_ajax.php
+++ b/mod/chat/chat_ajax.php
@@ -54,16 +54,7 @@ header('X-Powered-By: MOODLE-Chat-V2');
 
 switch ($action) {
 case 'init':
-    if($CFG->chat_use_cache){
-        $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_get_users($chatuser->chatid, $chatuser->groupid, $cm->groupingid);
     $users = chat_format_userlist($users, $course);
     $response['users'] = $users;
     echo json_encode($response);

diff --git a/mod/chat/lib.php b/mod/chat/lib.php
index 325656233e3abbb3c0fdcf2cf78f44409ab35e7a..a89211504897794494e0eb18ea7d68267f596904 100644 (file)
--- a/mod/chat/lib.php
+++ b/mod/chat/lib.php
@@ -922,7 +922,7 @@ function chat_format_userlist($users, $course) {
     foreach($users as $user){
         $item = array();
         $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['id'] = $user->id;
         $result[] = $item;