# This patch file was generated by NetBeans IDE
# This patch can be applied using context Tools: Apply Diff Patch action on respective folder.
# It uses platform neutral UTF-8 encoding.
# Above lines and this line are ignored by the patching process.
Index: moodle/mod/assignment/type/uploadsingle/assignment.class.php
--- moodle/mod/assignment/type/uploadsingle/assignment.class.php Base (1.63)
+++ moodle/mod/assignment/type/uploadsingle/assignment.class.php Locally Modified (Based On 1.63)
@@ -50,14 +50,15 @@
 
         $this->view_dates();
 
-        $filecount = $this->count_user_files($USER->id);
+        $submission = $this->get_submission($USER->id);
+        $filecount = $this->count_user_files($submission->id);
 
         if ($submission = $this->get_submission()) {
             if ($submission->timemarked) {
                 $this->view_feedback();
             }
             if ($filecount) {
-                echo $OUTPUT->box($this->print_user_files($USER->id, true), 'generalbox boxaligncenter');
+                echo $OUTPUT->box($this->print_user_files($submission->id, true), 'generalbox boxaligncenter');
             }
         }
 
@@ -100,8 +101,13 @@
                 $filename = $mform->get_new_filename('newfile');
                 if ($filename !== false) {
                     $fs->delete_area_files($this->context->id, 'assignment_submission', $USER->id);
-                    if ($file = $mform->save_stored_file('newfile', $this->context->id, 'assignment_submission', $USER->id, '/', $filename, false, $USER->id)) {
+
+                    if (empty($submission->id)) {
                         $submission = $this->get_submission($USER->id, true); //create new submission if needed
+                    }
+
+                    if ($file = $mform->save_stored_file('newfile', $this->context->id, 'assignment_submission', $submission->id, '/', $filename, false, $USER->id)) {
+                        $submission = $this->get_submission($USER->id, true); //create new submission if needed
                         $submission->timemodified = time();
                         $submission->numfiles     = 1;
                         if ($DB->update_record('assignment_submissions', $submission)) {