L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-66551-master' of git://github.com/lameze/moodle

Browse Source
This commit is contained in:
Jake Dallimore
2019-09-05 11:12:35 +08:00
parent 506a0f4bc0 8c07d7d760
commit cd1bdc7946
3 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/db/upgrade.php
+17
View File
@@ -3519,5 +3519,22 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2019083000.02);
}
if ($oldversion < 2019083000.04) {
// Delete "orphaned" subscriptions.
$sql = "SELECT DISTINCT es.userid
FROM {event_subscriptions} es
LEFT JOIN {user} u ON u.id = es.userid
WHERE u.deleted = 1 OR u.id IS NULL";
$deletedusers = $DB->get_field_sql($sql);
if ($deletedusers) {
list($sql, $params) = $DB->get_in_or_equal($deletedusers);
// Delete orphaned subscriptions.
$DB->execute("DELETE FROM {event_subscriptions} WHERE userid " . $sql, $params);
}
upgrade_main_savepoint(true, 2019083000.04);
}
return true;
}
lib/moodlelib.php
+3
View File
@@ -4247,6 +4247,9 @@ function delete_user(stdClass $user) {
// Now do a brute force cleanup.
// Remove user's calendar subscriptions.
$DB->delete_records('event_subscriptions', ['userid' => $user->id]);
// Remove from all cohorts.
$DB->delete_records('cohort_members', array('userid' => $user->id));
version.php
+1 -1
View File
@@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2019083000.03; // YYYYMMDD = weekly release date of this DEV branch.
$version = 2019083000.04; // YYYYMMDD = weekly release date of this DEV branch.
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.