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

Merge branch 'MDL-60972-35_delete_section_files' of https://github.com/awagner/moodle into MOODLE_35_STABLE

Browse Source
This commit is contained in:
Jake Dallimore
2019-01-21 09:03:46 +08:00
parent e489ebbb0b 9ebaea25f6
commit 247b70b0de
3 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
course/format/lib.php
+5
View File
@@ -1074,6 +1074,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));
lib/db/upgrade.php
+24
View File
@@ -2337,5 +2337,29 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2018051703.09);
}
if ($oldversion < 2018051704.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, 2018051704.02);
}
return true;
}
version.php
+1 -1
View File
@@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2018051704.01; // 20180517 = branching date YYYYMMDD - do not modify!
$version = 2018051704.02; // 20180517 = branching date YYYYMMDD - do not modify!
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.