MDL-55367 report_log: Prevent invalid time to be passed to Charts API

diff --git a/report/log/locallib.php b/report/log/locallib.php
index 33c0742..e14b1f5 100644 (file)
--- a/report/log/locallib.php
+++ b/report/log/locallib.php
@@ -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;