Merge branch 'MDL-60718-master' of git://github.com/sarjona/moodle

Author: David Monllao

analytics/classes/course.php

@@ -356,15 +356,15 @@ public function guess_end() {
         $monthsago = time() - (WEEKSECS * 4 * 2);
         $select = $filterselect . ' AND timeaccess > :timeaccess';
         $params = $filterparams + array('timeaccess' => $monthsago);
-        $sql = "SELECT timeaccess FROM {user_lastaccess} ula
+        $sql = "SELECT DISTINCT timeaccess FROM {user_lastaccess} ula
                   JOIN {enrol} e ON e.courseid = ula.courseid
                   JOIN {user_enrolments} ue ON e.id = ue.enrolid AND ue.userid = ula.userid
                  WHERE $select";
         if ($records = $DB->get_records_sql($sql, $params)) {
             return 0;
         }
 
-        $sql = "SELECT timeaccess FROM {user_lastaccess} ula
+        $sql = "SELECT DISTINCT timeaccess FROM {user_lastaccess} ula
                   JOIN {enrol} e ON e.courseid = ula.courseid
                   JOIN {user_enrolments} ue ON e.id = ue.enrolid AND ue.userid = ula.userid
                  WHERE $filterselect AND ula.timeaccess != 0