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

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

Browse Source
This commit is contained in:
Adrian Greeve
2020-08-20 10:24:42 +08:00
parent 895e5748e1 010f1eff60
commit c02fc98d06
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/db/upgrade.php
+3 -4
View File
@@ -2530,15 +2530,14 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2020061501.04);
}
if ($oldversion < 2020061501.08) {
if ($oldversion < 2020061501.09) {
// 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";
AND c.id IS NULL";
$stalefiles = $DB->get_records_sql($sql, ['component' => 'core_competency', 'filearea' => 'userevidence']);
$fs = get_file_storage();
@@ -2546,7 +2545,7 @@ function xmldb_main_upgrade($oldversion) {
$fs->get_file_instance($stalefile)->delete();
}
upgrade_main_savepoint(true, 2020061501.08);
upgrade_main_savepoint(true, 2020061501.09);
}
return true;
version.php
+1 -1
View File
@@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2020061501.08; // 20200615 = branching date YYYYMMDD - do not modify!
$version = 2020061501.09; // 20200615 = branching date YYYYMMDD - do not modify!
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.
$release = '3.9.1+ (Build: 20200814)'; // Human-friendly version name