Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

MDL-31914 Ensure that completion criteria are deleted when removing a…

… course module

Conflicts:

	lib/db/upgrade.php
	version.php

Conflicts:

	version.php
  • Loading branch information...
commit a8a076708eb44a16f27ad9afe95574e97acea3e2 1 parent 3d06074
Andrew Nicols andrewnicols authored stronk7 committed
Showing with 21 additions and 1 deletion.
  1. +1 −0  course/lib.php
  2. +19 −0 lib/db/upgrade.php
  3. +1 −1  version.php
1  course/lib.php
View
@@ -2836,6 +2836,7 @@ function delete_course_module($id) {
// very quick on an empty table)
$DB->delete_records('course_modules_completion', array('coursemoduleid' => $cm->id));
$DB->delete_records('course_modules_availability', array('coursemoduleid'=> $cm->id));
+ $DB->delete_records('course_completion_criteria', array('moduleinstance'=> $cm->id));
delete_context(CONTEXT_MODULE, $cm->id);
return $DB->delete_records('course_modules', array('id'=>$cm->id));
19 lib/db/upgrade.php
View
@@ -6762,6 +6762,25 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2011070104.12);
}
+ if ($oldversion < 2011070105.03) {
+ // Delete orphaned criteria which were left when modules were removed
+ if ($DB->get_dbfamily() === 'mysql') {
+ $sql = "DELETE cc FROM {course_completion_criteria} cc
+ LEFT JOIN {course_modules} cm ON cm.id = cc.moduleinstance
+ WHERE cm.id IS NULL";
+ } else {
+ $sql = "DELETE FROM {course_completion_criteria}
+ WHERE NOT EXISTS (
+ SELECT 'x' FROM {course_modules}
+ WHERE {course_modules}.id = {course_completion_criteria}.moduleinstance)";
+ }
+ $DB->execute($sql);
+
+ // Main savepoint reached
+ upgrade_main_savepoint(true, 2011070105.03);
+ }
+
+
return true;
}
2  version.php
View
@@ -30,7 +30,7 @@
defined('MOODLE_INTERNAL') || die();
-$version = 2011070105.02; // 20110701 = branching date YYYYMMDD - do not modify!
+$version = 2011070105.03; // 20110701 = branching date YYYYMMDD - do not modify!
// RR = release increments - 00 in DEV branches
// .XX = incremental changes
Please sign in to comment.
Something went wrong with that request. Please try again.