From ea67a0679dd2016dcffc29c0ebe1bf3e73940cae Mon Sep 17 00:00:00 2001 From: Rajesh Taneja Date: Fri, 19 Oct 2012 16:07:05 +0800 Subject: [PATCH] MDL-35910 Assignment 2.2: Fixed included files in assignment zip. If Marking button is enabled, assignment is open and is not finalized, then don't add file to zip --- mod/assignment/type/upload/assignment.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mod/assignment/type/upload/assignment.class.php b/mod/assignment/type/upload/assignment.class.php index 91c5f5fe870..8ca17bd973e 100644 --- a/mod/assignment/type/upload/assignment.class.php +++ b/mod/assignment/type/upload/assignment.class.php @@ -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