mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-05 08:23:01 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip-MDL-42463-master' of git://github.com/marinaglancy/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2013-10-29 14:54:44 +08:00
commit 6cd49ef747
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mod/chat/lib.php
View File

@ -274,14 +274,13 @@ function chat_print_recent_activity($course, $viewfullnames, $timestart) {
continue;
}
$cm = $modinfo->cms[$cmid];
$cm->lasttime = $mcm->lasttime;
if (!$modinfo->cms[$cm->id]->uservisible) {
continue;
}
if (groups_get_activity_groupmode($cm) != SEPARATEGROUPS
or has_capability('moodle/site:accessallgroups', context_module::instance($cm->id))) {
if ($timeout > time() - $cm->lasttime) {
if ($timeout > time() - $mcm->lasttime) {
$current[] = $cm;
} else {
$past[] = $cm;
@ -314,8 +313,8 @@ function chat_print_recent_activity($course, $viewfullnames, $timestart) {
continue;
}
$cm->lasttime = $mcm->lasttime;
if ($timeout > time() - $cm->lasttime) {
$mcms[$cmid]->lasttime = $mcm->lasttime;
if ($timeout > time() - $mcm->lasttime) {
$current[] = $cm;
} else {
$past[] = $cm;
@ -333,7 +332,7 @@ function chat_print_recent_activity($course, $viewfullnames, $timestart) {
foreach ($past as $cm) {
$link = $CFG->wwwroot.'/mod/chat/view.php?id='.$cm->id;
$date = userdate($cm->lasttime, $strftimerecent);
$date = userdate($mcms[$cm->id]->lasttime, $strftimerecent);
echo '<div class="head"><div class="date">'.$date.'</div></div>';
echo '<div class="info"><a href="'.$link.'">'.format_string($cm->name,true).'</a></div>';
}
@ -371,7 +370,7 @@ function chat_print_recent_activity($course, $viewfullnames, $timestart) {
}
$link = $CFG->wwwroot.'/mod/chat/view.php?id='.$cm->id;
$date = userdate($cm->lasttime, $strftimerecent);
$date = userdate($mcms[$cm->id]->lasttime, $strftimerecent);
echo '<div class="head"><div class="date">'.$date.'</div></div>';
echo '<div class="info"><a href="'.$link.'">'.format_string($cm->name,true).'</a></div>';