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

MDL-57486 tool_recyclebin: Delete items when context already deleted.

Browse Source
This commit is contained in:
Dan Marsden
2018-05-29 14:24:50 +12:00
parent 22744b745b
commit 5efcb522b1
2 changed files with 37 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/tool/recyclebin/classes/course_bin.php
+16 -6
View File
@@ -274,13 +274,23 @@ class course_bin extends base_bin {
global $DB;
// Grab the course context.
$context = \context_course::instance($this->_courseid);
$context = \context_course::instance($this->_courseid, IGNORE_MISSING);
// Delete the files.
$fs = get_file_storage();
$files = $fs->get_area_files($context->id, 'tool_recyclebin', TOOL_RECYCLEBIN_COURSE_BIN_FILEAREA, $item->id);
foreach ($files as $file) {
$file->delete();
if (!empty($context)) {
// Delete the files.
$fs = get_file_storage();
$fs->delete_area_files($context->id, 'tool_recyclebin', TOOL_RECYCLEBIN_COURSE_BIN_FILEAREA, $item->id);
} else {
// Course context has been deleted. Find records using $item->id as this is unique for course bin recyclebin.
$files = $DB->get_recordset('files', array('component' => 'tool_recyclebin',
'filearea' => TOOL_RECYCLEBIN_COURSE_BIN_FILEAREA,
'itemid' => $item->id));
$fs = get_file_storage();
foreach ($files as $filer) {
$file = $fs->get_file_instance($filer);
$file->delete();
}
$files->close();
}
// Delete the record.