moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master_MDL-66864' of https://github.com/golenkovm/moodle

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2019-10-13 02:08:10 +02:00
commit 0b30d47973
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/db/upgrade.php
View file

@ -2028,16 +2028,18 @@ function xmldb_main_upgrade($oldversion) {
if ($oldversion < 2018092800.02) { if ($oldversion < 2018092800.02) {
// Delete any contacts that are not mutual (meaning they both haven't added each other). // Delete any contacts that are not mutual (meaning they both haven't added each other).
do {
$sql = "SELECT c1.id $sql = "SELECT c1.id
FROM {message_contacts} c1 FROM {message_contacts} c1
LEFT JOIN {message_contacts} c2 LEFT JOIN {message_contacts} c2
ON c1.userid = c2.contactid ON c1.userid = c2.contactid
AND c1.contactid = c2.userid AND c1.contactid = c2.userid
WHERE c2.id IS NULL"; WHERE c2.id IS NULL";
if ($contacts = $DB->get_records_sql($sql)) { if ($contacts = $DB->get_records_sql($sql, null, 0, 1000)) {
list($insql, $inparams) = $DB->get_in_or_equal(array_keys($contacts)); list($insql, $inparams) = $DB->get_in_or_equal(array_keys($contacts));
$DB->delete_records_select('message_contacts', "id $insql", $inparams); $DB->delete_records_select('message_contacts', "id $insql", $inparams);
} }
} while ($contacts);
upgrade_main_savepoint(true, 2018092800.02); upgrade_main_savepoint(true, 2018092800.02);
} }