Merge branch 'MDL-46282-master' of git://github.com/andrewnicols/moodle

Conflicts: version.php
moodle · Sep 30, 2014 · db34f8c · db34f8c
2 parents 77218e4 + 6c0bfb1
commit db34f8c
Show file tree

Hide file tree

Showing 11 changed files with 1,807 additions and 3 deletions.
diff --git a/lib/adminlib.php b/lib/adminlib.php
@@ -202,6 +202,13 @@ function uninstall_plugin($type, $name) {
     // Delete scheduled tasks.
     $DB->delete_records('task_scheduled', array('component' => $pluginname));
 
+    // Delete Inbound Message datakeys.
+    $DB->delete_records_sql('messageinbound_datakeys',
+            'handler IN (SELECT id FROM {messageinbound_handlers} WHERE component = ?)', array($pluginname));
+
+    // Delete Inbound Message handlers.
+    $DB->delete_records('messageinbound_handlers', array('component' => $pluginname));
+
     // delete all the logs
     $DB->delete_records('log', array('module' => $pluginname));