MDL-16072 converted forum reset

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 52d671079122f428789e7571a8e4d8ede0f78242..2f66ecca79fc2fee19d63464b35e956038b17e01 100644 (file)
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -6691,9 +6691,14 @@ function forum_reset_userdata($data) {
         $DB->delete_records_select('forum_discussions', "forum IN ($forumssql)", $params);
 
         // now get rid of all attachments
+        $fs = get_file_storage();
         if ($forums = $DB->get_records_sql($forumssql, $params)) {
             foreach ($forums as $forumid=>$unused) {
-                fulldelete($CFG->dataroot.'/'.$data->courseid.'/moddata/forum/'.$forumid);
+                if (!$cm = get_coursemodule_from_instance('forum', $forumid)) {
+                    continue;
+                }
+                $context = get_context_instance(CONTEXT_MODULE, $cm->id);
+                $fs->delete_area_files($context->id, 'forum_attachment');
             }
         }