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

Merge branch 'MDL-67312-37' of git://github.com/lameze/moodle into MOODLE_37_STABLE

Browse Source
This commit is contained in:
Sara Arjona
2020-01-20 08:05:16 +01:00
parent 28b0d9256f 2e6729e923
commit 887f9c3fc6
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/db/upgrade.php
+11 -1
View File
@@ -3404,7 +3404,7 @@ function xmldb_main_upgrade($oldversion) {
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);
$deletedusers = $DB->get_fieldset_sql($sql);
if ($deletedusers) {
list($sql, $params) = $DB->get_in_or_equal($deletedusers);
@@ -3459,5 +3459,15 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2019052003.05);
}
if ($oldversion < 2019052004.02) {
// Delete all orphaned subscription events.
$select = "subscriptionid IS NOT NULL
AND subscriptionid NOT IN (SELECT id from {event_subscriptions})";
$DB->delete_records_select('event', $select);
upgrade_main_savepoint(true, 2019052004.02);
}
return true;
}
lib/moodlelib.php
+4 -1
View File
@@ -4222,7 +4222,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.
version.php
+1 -1
View File
@@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2019052004.01; // 20190520 = branching date YYYYMMDD - do not modify!
$version = 2019052004.02; // 20190520 = branching date YYYYMMDD - do not modify!
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.