From a4051353d12af7baee542ece3bc293c148e94ee7 Mon Sep 17 00:00:00 2001 From: Dan Poltawski Date: Thu, 29 Mar 2012 16:05:47 +0800 Subject: [PATCH] Revert "Merge branch 'MDL-31914-master-4' of git://git.luns.net.uk/moodle" This reverts commit 296c0247c6cc9e525721fc92b5a78c7146e6887d, reversing changes made to 2511b0742a3695298d8216fe9723581c089909d7. Conflicts: lib/db/upgrade.php version.php --- course/lib.php | 1 - lib/db/upgrade.php | 18 ------------------ 2 files changed, 19 deletions(-) diff --git a/course/lib.php b/course/lib.php index b4488d99ac7..dfc33df1c0e 100644 --- a/course/lib.php +++ b/course/lib.php @@ -2929,7 +2929,6 @@ 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)); diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php index 28d37ec795d..8d8fffff515 100644 --- a/lib/db/upgrade.php +++ b/lib/db/upgrade.php @@ -317,24 +317,6 @@ function xmldb_main_upgrade($oldversion) { upgrade_main_savepoint(true, 2012031500.04); } - if ($oldversion < 2012032300.01) { - // 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, 2012032300.01); - } - if ($oldversion < 2012032300.02) { // Migrate the old admin debug setting. if ($CFG->debug == 38911) {