From a7d09b7008a1f5a1862c905e86bcfaefa326695b Mon Sep 17 00:00:00 2001 From: sam marshall Date: Tue, 15 May 2012 11:38:03 +0100 Subject: [PATCH] MDL-32988 Lib: Course delete does availability/completion in wrong order When deleting modules that failed to delete using normal method, it deleted the course-modules table first and then the availability/completion, which depend on the entries in course-modules table. This commit switches the order. --- lib/moodlelib.php | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/lib/moodlelib.php b/lib/moodlelib.php index d78129272f9..aeb89f14018 100644 --- a/lib/moodlelib.php +++ b/lib/moodlelib.php @@ -4528,7 +4528,20 @@ function remove_course_contents($courseid, $showfeedback = true, array $options // Ooops, this module is not properly installed, force-delete it in the next block } } + // We have tried to delete everything the nice way - now let's force-delete any remaining module data + + // Remove all data from availability and completion tables that is associated + // with course-modules belonging to this course. Note this is done even if the + // features are not enabled now, in case they were enabled previously. + $DB->delete_records_select('course_modules_completion', + 'coursemoduleid IN (SELECT id from {course_modules} WHERE course=?)', + array($courseid)); + $DB->delete_records_select('course_modules_availability', + 'coursemoduleid IN (SELECT id from {course_modules} WHERE course=?)', + array($courseid)); + + // Remove course-module data. $cms = $DB->get_records('course_modules', array('course'=>$course->id)); foreach ($cms as $cm) { if ($module = $DB->get_record('modules', array('id'=>$cm->module))) { @@ -4541,15 +4554,7 @@ function remove_course_contents($courseid, $showfeedback = true, array $options context_helper::delete_instance(CONTEXT_MODULE, $cm->id); $DB->delete_records('course_modules', array('id'=>$cm->id)); } - // Remove all data from availability and completion tables that is associated - // with course-modules belonging to this course. Note this is done even if the - // features are not enabled now, in case they were enabled previously - $DB->delete_records_select('course_modules_completion', - 'coursemoduleid IN (SELECT id from {course_modules} WHERE course=?)', - array($courseid)); - $DB->delete_records_select('course_modules_availability', - 'coursemoduleid IN (SELECT id from {course_modules} WHERE course=?)', - array($courseid)); + if ($showfeedback) { echo $OUTPUT->notification($strdeleted.get_string('type_mod_plural', 'plugin'), 'notifysuccess'); } -- 2.17.1