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

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

Browse Source
This commit is contained in:
Adrian Greeve
2020-08-20 09:54:48 +08:00
parent 6e116209db f968aaf7c4
commit 257b90d10c
2 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/db/upgrade.php
+18 -19
View File
@@ -2542,25 +2542,6 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2020072300.01);
}
if ($oldversion < 2020081400.01) {
// Delete all user evidence files from users that have been deleted.
$sql = "SELECT DISTINCT f.*
FROM {files} f
LEFT JOIN {context} c ON f.contextid = c.id
LEFT JOIN {user} u ON c.instanceid = u.id
WHERE f.component = :component
AND f.filearea = :filearea
AND u.deleted = 1";
$stalefiles = $DB->get_records_sql($sql, ['component' => 'core_competency', 'filearea' => 'userevidence']);
$fs = get_file_storage();
foreach ($stalefiles as $stalefile) {
$fs->get_file_instance($stalefile)->delete();
}
upgrade_main_savepoint(true, 2020081400.01);
}
if ($oldversion < 2021052500.01) {
// Define field timecreated to be added to task_adhoc.
@@ -2576,5 +2557,23 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2021052500.01);
}
if ($oldversion < 2021052500.02) {
// Delete all user evidence files from users that have been deleted.
$sql = "SELECT DISTINCT f.*
FROM {files} f
LEFT JOIN {context} c ON f.contextid = c.id
WHERE f.component = :component
AND f.filearea = :filearea
AND c.id IS NULL";
$stalefiles = $DB->get_records_sql($sql, ['component' => 'core_competency', 'filearea' => 'userevidence']);
$fs = get_file_storage();
foreach ($stalefiles as $stalefile) {
$fs->get_file_instance($stalefile)->delete();
}
upgrade_main_savepoint(true, 2021052500.02);
}
return true;
}
version.php
+1 -1
View File
@@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2021052500.01; // YYYYMMDD = weekly release date of this DEV branch.
$version = 2021052500.02; // YYYYMMDD = weekly release date of this DEV branch.
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.
$release = '4.0dev (Build: 20200814)'; // Human-friendly version name