From c7027c037b5a185d65d407e4098cae8b9616186c Mon Sep 17 00:00:00 2001
From: Simey Lameze <simey@moodle.com>
Date: Thu, 21 Nov 2019 18:36:05 +0800
Subject: [PATCH] MDL-67312 core_user: clean subs events on user deletion

---
 lib/moodlelib.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 1b69c4a1281..f0ced444409 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -4250,7 +4250,10 @@ function delete_user(stdClass $user) {
 
     // Now do a brute force cleanup.
 
-    // Remove user's calendar subscriptions.
+    // Delete all user events and subscription events.
+    $DB->delete_records_select('event', 'userid = :userid AND subscriptionid IS NOT NULL', ['userid' => $user->id]);
+
+    // Now, delete all calendar subscription from the user.
     $DB->delete_records('event_subscriptions', ['userid' => $user->id]);
 
     // Remove from all cohorts.