Index: lib.php =================================================================== --- lib.php (revision 3832) +++ lib.php (working copy) @@ -3538,7 +3538,8 @@ function assignment_get_all_submissions($assignment, $sort="", $dir="DESC") { /// Return all assignment submissions by ENROLLED students (even empty) global $CFG, $DB; - + + if ($sort == "lastname" or $sort == "firstname") { $sort = "u.$sort $dir"; } else if (empty($sort)) { @@ -3552,12 +3553,16 @@ if ($assignment->course == SITEID) { $select = ''; }*/ - + $cmid = $assignment->cm->id; + $context = context_module::instance($cmid); + list($enroledsql, $params) = get_enrolled_sql($context, 'mod/assignment:view', 0); + $params['assignmentid'] = $assignment->id; return $DB->get_records_sql("SELECT a.* - FROM {assignment_submissions} a, {user} u - WHERE u.id = a.userid - AND a.assignment = ? - ORDER BY $sort", array($assignment->id)); + FROM {assignment_submissions} a + INNER JOIN ($enroledsql) u + WHERE u.id = a.userid ON u.id =s.userid + AND a.assignment = :assignmentid + ORDER BY $sort", $params);//array($assignment->id)); }