MDL-68683 competencies: fix query to delete stale files

diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index 7ce3c1e..94d0c99 100644 (file)
--- 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 ae78361..88d1169 100644 (file)
--- 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