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

This commit is contained in:
Dan Poltawski 2012-10-30 10:00:11 +08:00
commit 752a3f14be

View File

@ -1164,9 +1164,9 @@ class assignment_upload extends assignment_base {
}
$filename = str_replace(' ', '_', clean_filename($this->course->shortname.'-'.$this->assignment->name.'-'.$groupname.$this->assignment->id.".zip")); //name of new zip file.
foreach ($submissions as $submission) {
// If assignment is open and submission is not finalized then don't add it to zip.
// If assignment is open and submission is not finalized and marking button enabled then don't add it to zip.
$submissionstatus = $this->is_finalized($submission);
if ($this->isopen() && empty($submissionstatus)) {
if ($this->isopen() && empty($submissionstatus) && !empty($this->assignment->var4)) {
continue;
}
$a_userid = $submission->userid; //get userid