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

andrewnicols · andrewnicols · commit 7ee117fab8b7 · 2016-01-20T10:02:30.000+08:00
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;

Original file line number	Diff line number	Diff line change
`@@ -7205,7 +7205,7 @@ protected function add_attempt($userid) {`
`7205`	`7205`
`7206`	`7206`	`$this->update_submission($newsubmission, $userid, false, $this->get_instance()->teamsubmission);`
`7207`	`7207`	`$flags = $this->get_user_flags($userid, false);`
`7208`		`- if ($flags->locked) {`
	`7208`	`+ if (isset($flags->locked) && $flags->locked) { // May not exist.`
`7209`	`7209`	`$this->process_unlock_submission($userid);`
`7210`	`7210`	`}`
`7211`	`7211`	`return true;`