From fb9670a9b273c2aed13a5b2c5c2fbe4403aa7dc4 Mon Sep 17 00:00:00 2001 From: Simey Lameze Date: Thu, 20 Aug 2020 09:17:42 +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 e6ca1e86bfa..28e2f1ef05f 100644 --- a/lib/db/upgrade.php +++ b/lib/db/upgrade.php @@ -3930,15 +3930,14 @@ function xmldb_main_upgrade($oldversion) { upgrade_main_savepoint(true, 2019111804.01); } - if ($oldversion < 2019111804.07) { + if ($oldversion < 2019111804.08) { // 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(); @@ -3946,7 +3945,7 @@ function xmldb_main_upgrade($oldversion) { $fs->get_file_instance($stalefile)->delete(); } - upgrade_main_savepoint(true, 2019111804.07); + upgrade_main_savepoint(true, 2019111804.08); } return true; diff --git a/version.php b/version.php index 8d628b81425..01c56603238 100644 --- a/version.php +++ b/version.php @@ -29,7 +29,7 @@ defined('MOODLE_INTERNAL') || die(); -$version = 2019111804.07; // 20191118 = branching date YYYYMMDD - do not modify! +$version = 2019111804.08; // 20191118 = branching date YYYYMMDD - do not modify! // RR = release increments - 00 in DEV branches. // .XX = incremental changes. $release = '3.8.4+ (Build: 20200814)'; // Human-friendly version name