commit d006a7cdf278f2217d7f8c391066f7166e9d5539 Author: Kirill Astashov Date: Fri Aug 26 15:31:40 2011 +0930 UNSW2-139: Fix Error reading from databse for separate groups courses diff --git a/course/recent_form.php b/course/recent_form.php index a9f78ef..49b04e2 100644 --- a/course/recent_form.php +++ b/course/recent_form.php @@ -60,9 +60,21 @@ class recent_form extends moodleform { $group = ''; } - if ($enrolled = get_enrolled_users($context, null, $group, user_picture::fields('u'))) { - foreach ($enrolled as $euser) { - $options[$euser->id] = fullname($euser, $viewfullnames); + if (!empty($group)) { + foreach ($group[0] AS $groupid) { + if ($enrolled = get_enrolled_users($context, null, $groupid, user_picture::fields('u'))) { + foreach ($enrolled as $euser) { + if (!array_key_exists($euser->id, $options)) { + $options[$euser->id] = fullname($euser, $viewfullnames); + } + } + } + } + } else { + if ($enrolled = get_enrolled_users($context, null, $group, user_picture::fields('u'))) { + foreach ($enrolled as $euser) { + $options[$euser->id] = fullname($euser, $viewfullnames); + } } } $mform->addElement('select', 'user', get_string('participants'), $options);