Merged fixes for recent activity from stable MDL-7134

diff --git a/course/lib.php b/course/lib.php
index 9a2bb0dbfbe58fae63f22c5a695fa88ed0a5238c..e7f5f98d4345e208cf067dcb92c05fd6a8407124 100644 (file)
--- a/course/lib.php
+++ b/course/lib.php
@@ -780,9 +780,9 @@ function print_recent_activity($course) {
 
     $timestart = time() - COURSE_MAX_RECENT_PERIOD;
 
-    if (!empty($USER->timeaccess[$course->id])) {
-        if ($USER->timeaccess[$course->id] > $timestart) {
-            $timestart = $USER->timeaccess[$course->id];
+    if (!empty($USER->lastcourseaccess[$course->id])) {
+        if ($USER->lastcourseaccess[$course->id] > $timestart) {
+            $timestart = $USER->lastcourseaccess[$course->id];
         }
     }
 

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 2227280f1eaca1060cfc7b96bfe3bfaa98e9f162..05d798ee587842ae9f744fa564da14caa64b2b3a 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -2547,6 +2547,12 @@ function get_complete_user_data($field, $value) {
         }
     }
 
+    if ($lastaccesses = get_records('user_lastaccess', 'userid', $user->id)) {
+        foreach ($lastaccesses as $lastaccess) {
+            $user->lastcourseaccess[$lastaccess->courseid] = $lastaccess->timeaccess;
+        }
+    }
+
     if ($groups = get_records('groups_members', 'userid', $user->id)) {
         foreach ($groups as $groupmember) {
             $courseid = get_field('groups', 'courseid', 'id', $groupmember->groupid);