Merge branch 'wip-MDL-40650-master' of git://github.com/abgreeve/moodle

This commit is contained in:
Marina Glancy 2013-07-15 12:25:23 +10:00
commit 78eca0fc3c

View File

@ -243,7 +243,7 @@ class workshop_manual_allocator implements workshop_allocator {
$reviewers = array(); $reviewers = array();
if ($submissions) { if ($submissions) {
list($submissionids, $params) = $DB->get_in_or_equal(array_keys($submissions), SQL_PARAMS_NAMED); list($submissionids, $params) = $DB->get_in_or_equal(array_keys($submissions), SQL_PARAMS_NAMED);
$picturefields = user_picture::fields('r', array(), 'reviewerid') $picturefields = user_picture::fields('r', array(), 'reviewerid');
$sql = "SELECT a.id AS assessmentid, a.submissionid, $picturefields, $sql = "SELECT a.id AS assessmentid, a.submissionid, $picturefields,
s.id AS submissionid, s.authorid s.id AS submissionid, s.authorid
FROM {workshop_assessments} a FROM {workshop_assessments} a