--- locallib.php.~1.28.2.3.~	2008-04-04 06:32:59.000000000 +0200
+++ locallib.php	2008-06-12 17:21:08.000000000 +0200
@@ -333,7 +333,7 @@
     // function returns the number of ungraded assessments by students of STUDENT submissions
     
     $n = 0;
-    if ($submissions = exercise_get_student_submissions($exercise, $groupid)) {
+    if ($submissions = exercise_get_student_submissions($exercise, "time", $groupid)) {
         foreach ($submissions as $submission) {
             if ($assessments = exercise_get_assessments($submission)) {
                 foreach ($assessments as $assessment) {
@@ -575,6 +575,8 @@
                 {$CFG->prefix}groups_members g, {$CFG->prefix}exercise_submissions s
                 WHERE g.groupid = $groupid
                 AND s.exerciseid = $exercise->id
+                AND n.id = s.userid
+                AND n.id = g.userid
                 ORDER BY $order");
 
     } 
@@ -615,6 +617,7 @@
         return get_records_sql("SELECT s.* FROM {$CFG->prefix}exercise_submissions s, 
                 {$CFG->prefix}user n  
                 WHERE s.exerciseid = $exercise->id
+                AND n.id = s.userid
                 ORDER BY $order");
     }
 }

