Merged from MOODLE_15_STABLE: Metacourse unenrolling: fixes bug #4541

moodle · Jan 10, 2006 · 79a1029 · 79a1029
1 parent 863a910
commit 79a1029
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/lib/moodlelib.php b/lib/moodlelib.php
@@ -2823,6 +2823,7 @@ function enrol_student($userid, $courseid, $timestart=0, $timeend=0, $enrol='man
  * @return bool
  */
 function unenrol_student($userid, $courseid=0) {
+    global $CFG;
 
     if ($courseid) {
         /// First delete any crucial stuff that might still send mail
@@ -2836,10 +2837,14 @@ function unenrol_student($userid, $courseid=0) {
                 delete_records('groups_members', 'groupid', $group->id, 'userid', $userid);
             }
         }
-        // enrol the student in any parent meta courses...
+        // unenrol the student from any parent meta courses...
         if ($parents = get_records('course_meta','child_course',$courseid)) {
             foreach ($parents as $parent) {
-                unenrol_student($userid, $parent->parent_course);
+                if (!record_exists_sql('SELECT us.id FROM '.$CFG->prefix.'user_students us, '
+                                       .$CFG->prefix.'course_meta cm WHERE cm.child_course = us.course
+                                        AND us.userid = '.$userid .' AND us.course != '.$courseid)) {
+                    unenrol_student($userid, $parent->parent_course);
+                }
             }
         }
         return delete_records('user_students', 'userid', $userid, 'course', $courseid);