MDL-27856 Fix incorrect instanceid assignment.

moodle · Sep 13, 2012 · 9549090 · 9549090
1 parent b01c955
commit 9549090
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/enrol/cohort/lib.php b/enrol/cohort/lib.php
@@ -243,7 +243,7 @@ public function restore_instance(restore_enrolments_structure_step $step, stdCla
         if ($data->roleid and $DB->record_exists('cohort', array('id'=>$data->customint1))) {
             $instance = $DB->get_record('enrol', array('roleid'=>$data->roleid, 'customint1'=>$data->customint1, 'courseid'=>$course->id, 'enrol'=>$this->get_name()));
             if ($instance) {
-                $instanceid = $instance;
+                $instanceid = $instance->id;
             } else {
                 $instanceid = $this->add_instance($course, (array)$data);
             }
@@ -257,7 +257,7 @@ public function restore_instance(restore_enrolments_structure_step $step, stdCla
             $instance = $DB->get_record('enrol', array('roleid'=>$data->roleid, 'customint1'=>$data->customint1, 'courseid'=>$course->id, 'enrol'=>$this->get_name()));
 
             if ($instance) {
-                $instanceid = $instance;
+                $instanceid = $instance->id;
             } else {
                 $data->status = ENROL_INSTANCE_DISABLED;
                 $instanceid = $this->add_instance($course, (array)$data);