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

Merge branch 'MDL-66551-36' of git://github.com/lameze/moodle into MOODLE_36_STABLE

Browse Source
This commit is contained in:
Jake Dallimore
2019-09-05 11:16:53 +08:00
parent de6225210d 37e178e755
commit e3147eec7d
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
@@ -3090,5 +3090,22 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2018120305.04);
}
if ($oldversion < 2018120305.13) {
// 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, 2018120305.13);
}
return true;
}
lib/moodlelib.php
+3
View File
@@ -4182,6 +4182,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 = 2018120305.12; // 20181203 = branching date YYYYMMDD - do not modify!
$version = 2018120305.13; // 20181203 = branching date YYYYMMDD - do not modify!
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.