Deleting uploaded files when deleting an assignment instance + fixed quoting style...

diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index 6914194a840a0e26e5840410cfe8689808d99d1e..7e3f1b11818a98dbde473539535ed05f22555092 100644 (file)
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -444,11 +444,13 @@ class assignment_base {
     /**
      * Deletes an assignment activity
      *
-     * Deletes all database records and calendar events for this assignment.
+     * Deletes all database records, files and calendar events for this assignment.
      * @param $assignment object The assignment to be deleted
      * @return boolean False indicates error
      */
     function delete_instance($assignment) {
+        global $CFG;
+
         $result = true;
 
         if (! delete_records('assignment_submissions', 'assignment', $assignment->id)) {
@@ -473,6 +475,10 @@ class assignment_base {
             }
         }
 
+        // delete file area with all attachments - ignore errors
+        require_once($CFG->libdir.'/filelib.php');
+        fulldelete($CFG->dataroot.'/'.$assignment->course.'/'.$CFG->moddata.'/assignment/'.$assignment->id);
+
         return $result;
     }