moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Dan Poltawski 2012-10-30 10:00:11 +08:00
commit 752a3f14be
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mod/assignment/type/upload/assignment.class.php
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. $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) { 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); $submissionstatus = $this->is_finalized($submission);
if ($this->isopen() && empty($submissionstatus)) { if ($this->isopen() && empty($submissionstatus) && !empty($this->assignment->var4)) {
continue; continue;
} }
$a_userid = $submission->userid; //get userid $a_userid = $submission->userid; //get userid