Merge branch 'wip-mdl-30144' of git://github.com/rajeshtaneja/moodle

This commit is contained in:
Dan Poltawski 2013-02-04 13:54:27 +08:00
commit cf936fa297

View File

@ -3574,12 +3574,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);
}