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

Merge branch 'MDL-76066-400' of https://github.com/aanabit/moodle into MOODLE_400_STABLE

Browse Source
This commit is contained in:
Andrew Nicols
2023-02-09 10:48:23 +08:00
parent 1278c93a06 72773d10f6
commit 4efc9efd9b
1 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/data/lib.php
+9 -20
View File
@@ -1165,22 +1165,12 @@ function data_delete_instance($id) { // takes the dataid
$cm = get_coursemodule_from_instance('data', $data->id);
$context = context_module::instance($cm->id);
/// Delete all the associated information
// files
$fs = get_file_storage();
$fs->delete_area_files($context->id, 'mod_data');
// get all the records in this data
$sql = "SELECT r.id
FROM {data_records} r
WHERE r.dataid = ?";
$DB->delete_records_select('data_content', "recordid IN ($sql)", array($id));
// delete all the records and fields
$DB->delete_records('data_records', array('dataid'=>$id));
$DB->delete_records('data_fields', array('dataid'=>$id));
// Delete all information related to fields.
$fields = $DB->get_records('data_fields', ['dataid' => $id]);
foreach ($fields as $field) {
$todelete = data_get_field($field, $data, $cm);
$todelete->delete_field();
}
// Remove old calendar events.
$events = $DB->get_records('event', array('modulename' => 'data', 'instance' => $id));
@@ -2722,10 +2712,9 @@ abstract class data_preset_importer {
/* Data not used anymore so wipe! */
echo "Deleting field $currentfield->name<br />";
$id = $currentfield->id;
// Why delete existing data records and related comments/ratings??
$DB->delete_records('data_content', ['fieldid' => $id]);
$DB->delete_records('data_fields', ['id' => $id]);
// Delete all information related to fields.
$todelete = data_get_field_from_id($currentfield->id, $this->module);
$todelete->delete_field();
}
}