diff --git a/course/format/lib.php b/course/format/lib.php index 0ba58c6287f..40c880d5eb1 100644 --- a/course/format/lib.php +++ b/course/format/lib.php @@ -1111,6 +1111,11 @@ abstract class format_base { $DB->delete_records('course_sections', array('id' => $section->id)); rebuild_course_cache($course->id, true); + // Delete section summary files. + $context = \context_course::instance($course->id); + $fs = get_file_storage(); + $fs->delete_area_files($context->id, 'course', 'section', $section->id); + // Descrease 'numsections' if needed. if ($decreasenumsections) { $this->update_course_format_options(array('numsections' => $course->numsections - 1)); diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php index 37fa61013e2..64b87b6f002 100644 --- a/lib/db/upgrade.php +++ b/lib/db/upgrade.php @@ -2889,5 +2889,29 @@ function xmldb_main_upgrade($oldversion) { upgrade_main_savepoint(true, 2018120301.02); } + if ($oldversion < 2018120302.02) { + + // Delete all files that have been used in sections, which are already deleted. + $sql = "SELECT DISTINCT f.itemid as sectionid, f.contextid + FROM {files} f + LEFT JOIN {course_sections} s ON f.itemid = s.id + WHERE f.component = :component AND f.filearea = :filearea AND s.id IS NULL "; + + $params = [ + 'component' => 'course', + 'filearea' => 'section' + ]; + + $stalefiles = $DB->get_recordset_sql($sql, $params); + + $fs = get_file_storage(); + foreach ($stalefiles as $stalefile) { + $fs->delete_area_files($stalefile->contextid, 'course', 'section', $stalefile->sectionid); + } + $stalefiles->close(); + + upgrade_main_savepoint(true, 2018120302.02); + } + return true; } diff --git a/version.php b/version.php index dcd1b16f905..4601ad8fa73 100644 --- a/version.php +++ b/version.php @@ -29,7 +29,7 @@ defined('MOODLE_INTERNAL') || die(); -$version = 2018120302.01; // 20181203 = branching date YYYYMMDD - do not modify! +$version = 2018120302.02; // 20181203 = branching date YYYYMMDD - do not modify! // RR = release increments - 00 in DEV branches. // .XX = incremental changes.