WHen emptying a course, delete groups and events

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index e1e38b9cc9cf55af64f6c176420925b956a6e96f..bb122e90cd46227b9093636f48d23b6369a91ee1 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -973,6 +973,37 @@ function remove_course_contents($courseid, $showfeedback=true) {
         $result = false;
     }
 
+    // Delete any groups
+
+    if ($groups = get_records("groups", "courseid", $course->id)) {
+        foreach ($groups as $group) {
+            if (delete_records("groups_members", "groupid", $group->id)) {
+                if ($showfeedback) {
+                    notify("$strdeleted groups_members");
+                }
+            } else {
+                $result = false;
+            }
+            if (delete_records("groups", "id", $group->id)) {
+                if ($showfeedback) {
+                    notify("$strdeleted groups");
+                }
+            } else {
+                $result = false;
+            }
+        }
+    }
+
+    // Delete events
+
+    if (delete_records("event", "courseid", $course->id)) {
+        if ($showfeedback) {
+            notify("$strdeleted event");
+        }
+    } else {
+        $result = false;
+    }
+
     // Delete logs
 
     if (delete_records("log", "course", $course->id)) {