mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-55367-master' of git://github.com/lameze/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2016-08-01 14:25:38 +01:00
commit 65a427cc64
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
report/log/locallib.php
View File

@ -576,7 +576,9 @@ function report_log_userall_data($course, $user, $logreader) {
$rawlogs = report_log_usercourse($user->id, $courseselect, $coursestart, $logreader);
foreach ($rawlogs as $rawlog) {
$logs['series'][$rawlog->day] = $rawlog->num;
if (isset($logs['labels'][$rawlog->day])) {
$logs['series'][$rawlog->day] = $rawlog->num;
}
}
return $logs;
@ -616,7 +618,9 @@ function report_log_usertoday_data($course, $user, $date, $logreader) {
$rawlogs = report_log_userday($user->id, $courseselect, $daystart, $logreader);
foreach ($rawlogs as $rawlog) {
$logs['series'][$rawlog->hour] = $rawlog->num;
if (isset($logs['labels'][$rawlog->hour])) {
$logs['series'][$rawlog->hour] = $rawlog->num;
}
}
return $logs;