Merge branch 'MDL-38315-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE

2013-05-06 22:06:01 +08:00
parent 3565867b4f 276d1134e2
commit fc282e4ab3
7 changed files with 50 additions and 41 deletions
@@ -335,7 +335,7 @@ if ($mform->is_cancelled()) {
        $cm->groupmembersonly = $fromform->groupmembersonly;

        $completion = new completion_info($course);
-        if ($completion->is_enabled()) {
+        if ($completion->is_enabled() && !empty($fromform->completionunlocked)) {
            // Update completion settings
            $cm->completion                = $fromform->completion;
            $cm->completiongradeitemnumber = $fromform->completiongradeitemnumber;