Merged fixes for get_course_users from stable 1.4

diff --git a/course/lib.php b/course/lib.php
index d57237e51a4a12ee8480e4d7d8d1dda7daa9368a..b3453ab817297206742ccae0f4202f8c38e282f0 100644 (file)
--- a/course/lib.php
+++ b/course/lib.php
@@ -32,13 +32,7 @@ function print_recent_selector_form($course, $advancedfilter=0, $selecteduser=0,
         // Get all the possible users
         $users = array();
 
-        if ($course->category) {
-            $courseusers = get_course_users($course->id);
-        } else {
-            $courseusers = get_site_users("u.lastaccess DESC", "u.id, u.firstname, u.lastname");
-        }
-
-        if ($courseusers) {
+        if ($courseusers = get_course_users($course->id, '', '', 'u.id, u.firstname, u.lastname')) {
             foreach ($courseusers as $courseuser) {
                 $users[$courseuser->id] = fullname($courseuser, $isteacher);
             }
@@ -266,9 +260,8 @@ function print_log_selector_form($course, $selecteduser=0, $selecteddate="today"
                    'WHERE us.course='.$course->id.' AND gm.groupid='.$selectedgroup.
                    ' AND (gm.userid=us.userid OR gm.userid=ut.userid) AND gm.userid=u.id';
             $courseusers = get_records_sql($sql); 
-        }
-        else {
-            $courseusers = get_course_users($course->id);
+        } else {
+            $courseusers = get_course_users($course->id, '', '', 'u.id, u.firstname, u.lastname');
         }
     } else {
         $courseusers = get_site_users("u.lastaccess DESC", "u.id, u.firstname, u.lastname");

diff --git a/lib/datalib.php b/lib/datalib.php
index 5f884b7cd26a49f61177551c0a10fa913529d4b4..8a270920d254a8fced1c5ff0e4b10a1a5f911392 100644 (file)
--- a/lib/datalib.php
+++ b/lib/datalib.php
@@ -1295,7 +1295,7 @@ function get_course_teachers($courseid, $sort="t.authority ASC", $exceptions='')
 *
 * @param    type description
 */
-function get_course_users($courseid, $sort="timeaccess DESC", $exceptions='') {
+function get_course_users($courseid, $sort="timeaccess DESC", $exceptions='', $fields='*') {
 
     /// Using this method because the single SQL is too inefficient
     // Note that this has the effect that teachers and students are
@@ -1304,7 +1304,7 @@ function get_course_users($courseid, $sort="timeaccess DESC", $exceptions='') {
     if (!$teachers = get_course_teachers($courseid, $sort, $exceptions)) {
         $teachers = array();
     }
-    if (!$students = get_course_students($courseid, $sort, "", 0, 99999, "", "", NULL, "", '', $exceptions)) {
+    if (!$students = get_course_students($courseid, $sort, '', 0, 99999, '', '', NULL, '', $fields, $exceptions)) {
         $students = array();
     }
 
@@ -1394,9 +1394,9 @@ function search_users($courseid, $groupid, $searchtext, $sort='', $exceptions=''
 *
 * @param    type description
 */
-function get_site_users($sort="u.lastaccess DESC", $select="", $exceptions='') {
+function get_site_users($sort="u.lastaccess DESC", $fields='*', $exceptions='') {
 
-    return get_course_users(SITEID, $sort, '', 0, 999999, '', '', NULL, '', $select, $exceptions);
+    return get_course_users(SITEID, $sort, $exceptions, $fields);
 }