From 010f1eff6047e523773a0c20f2afea8102eec955 Mon Sep 17 00:00:00 2001 From: Simey Lameze Date: Thu, 20 Aug 2020 08:54:05 +0800 Subject: [PATCH] MDL-68683 competencies: fix query to delete stale files --- lib/db/upgrade.php | 7 +++---- version.php | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php index 7ce3c1e8d93..94d0c9937f5 100644 --- a/lib/db/upgrade.php +++ b/lib/db/upgrade.php @@ -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; diff --git a/version.php b/version.php index ae7836198fd..88d1169b48d 100644 --- a/version.php +++ b/version.php @@ -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 -- 2.17.1