From ac3fe66f069af0ec058b90dd5d4a4f46e799cd1f Mon Sep 17 00:00:00 2001 From: Michael Hughes Date: Fri, 1 Feb 2013 14:49:55 +0800 Subject: [PATCH] MDL-30144 Assignment 2.2: Download all as zip should only contain submission from active enroled users --- mod/assignment/lib.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php index 3688ac9590f..6544c0ed673 100644 --- a/mod/assignment/lib.php +++ b/mod/assignment/lib.php @@ -3553,12 +3553,15 @@ function assignment_get_all_submissions($assignment, $sort="", $dir="DESC") { if ($assignment->course == SITEID) { $select = ''; }*/ - + $context = context_module::instance($assignment->id); + list($enroledsql, $params) = get_enrolled_sql($context, 'mod/assignment:submit'); + $params['assignmentid'] = $assignment->id; return $DB->get_records_sql("SELECT a.* - FROM {assignment_submissions} a, {user} u + FROM {assignment_submissions} a + INNER JOIN (". $enroledsql .") u ON u.id = a.userid WHERE u.id = a.userid - AND a.assignment = ? - ORDER BY $sort", array($assignment->id)); + AND a.assignment = :assignmentid + ORDER BY $sort", $params); }