Merge branch 'MDL-50083' of https://github.com/stronk7/moodle

moodle · Jan 20, 2016 · 7ee117f · 7ee117f
2 parents 0ddbf9b + 5311e22
commit 7ee117f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php
@@ -7205,7 +7205,7 @@ protected function add_attempt($userid) {
 
         $this->update_submission($newsubmission, $userid, false, $this->get_instance()->teamsubmission);
         $flags = $this->get_user_flags($userid, false);
-        if ($flags->locked) {
+        if (isset($flags->locked) && $flags->locked) { // May not exist.
             $this->process_unlock_submission($userid);
         }
         return true;