Merging changes from MOODLE_14_STABLE

diff --git a/lib/datalib.php b/lib/datalib.php
index 90d9eb223d097200d0b6c010e601cd44f10e051e..de7a36957fea5ca752254400092e56133cfe35c1 100644 (file)
--- a/lib/datalib.php
+++ b/lib/datalib.php
@@ -1109,7 +1109,7 @@ function get_recent_enrolments($courseid, $timestart) {
 
     global $CFG;
 
-    return get_records_sql("SELECT DISTINCT u.id, u.firstname, u.lastname
+    return get_records_sql("SELECT DISTINCT u.id, u.firstname, u.lastname, l.time
                             FROM {$CFG->prefix}user u,
                                  {$CFG->prefix}user_students s,
                                  {$CFG->prefix}log l