fixed access check when editting notes in advanced upload assignment type; merged...

diff --git a/mod/assignment/type/upload/assignment.class.php b/mod/assignment/type/upload/assignment.class.php
index ccc670e4f27f3f1e490322d8499dd514a16e43b4..21b3c86c5a78970d7b8bc2f244ae53272bb122c1 100644 (file)
--- a/mod/assignment/type/upload/assignment.class.php
+++ b/mod/assignment/type/upload/assignment.class.php
@@ -436,6 +436,20 @@ class assignment_upload extends assignment_base {
 
         $returnurl = 'view.php?id='.$this->cm->id;
 
+        if ($submission = $this->get_submission($USER->id)) {
+            $defaulttext = $submission->data1;
+        } else {
+            $defaulttext = '';
+        }
+
+        if (!$this->can_update_notes($submission)) {
+            $this->view_header(get_string('upload'));
+            notify(get_string('uploaderror', 'assignment'));
+            print_continue($returnurl);
+            $this->view_footer();
+            die;
+        }
+
         if (data_submitted() and $action == 'savenotes') {
             $text = required_param('text', PARAM_RAW); // to be cleaned before display
             $submission = $this->get_submission($USER->id, true); // get or create submission
@@ -457,12 +471,6 @@ class assignment_upload extends assignment_base {
         }
 
         /// show notes edit form
-        if ($submission = $this->get_submission($USER->id)) {
-            $defaulttext = $submission->data1;
-        } else {
-            $defaulttext = '';
-        }
-
         $this->view_header(get_string('notes', 'assignment'));
         print_heading(get_string('notes', 'assignment'), 'center');