From c5a90a4a5dc62137db9947d5b3ab75d2184f3364 Mon Sep 17 00:00:00 2001 From: Simey Lameze Date: Thu, 28 Jul 2016 15:58:14 +0800 Subject: [PATCH] MDL-55367 report_log: Prevent invalid time to be passed to Charts API --- report/log/locallib.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/report/log/locallib.php b/report/log/locallib.php index 33c07421aea..e14b1f5e158 100644 --- 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; -- 2.11.4.GIT