From c8ac7e7938a90a27669bcdcd48882d05e562f39e Mon Sep 17 00:00:00 2001 From: Damyon Wiese Date: Fri, 13 Jul 2012 12:40:25 +0800 Subject: [PATCH] MDL-34313: Deleting assignfeedback plugins deletes config for assignsubmission_plugin instead. --- mod/assign/adminlib.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mod/assign/adminlib.php b/mod/assign/adminlib.php index a6b2eb11250..43c1e7d8e16 100644 --- a/mod/assign/adminlib.php +++ b/mod/assign/adminlib.php @@ -269,7 +269,7 @@ class assign_plugin_manager { if ($confirm) { // Delete any configuration records. - if (!unset_all_config_for_plugin('assignsubmission_' . $plugin)) { + if (!unset_all_config_for_plugin($this->subtype . '_' . $plugin)) { $this->error = $OUTPUT->notification(get_string('errordeletingconfig', 'admin', $this->subtype . '_' . $plugin)); } @@ -282,7 +282,8 @@ class assign_plugin_manager { $DB->delete_records('assign_plugin_config', array('plugin'=>$plugin, 'subtype'=>$this->subtype)); // Then the tables themselves - drop_plugin_tables($this->subtype . '_' . $plugin, $CFG->dirroot . '/mod/assign/' . $this->subtype . '/' .$plugin. '/db/install.xml', false); + $shortsubtype = substr($this->subtype, strlen('assign')); + drop_plugin_tables($this->subtype . '_' . $plugin, $CFG->dirroot . '/mod/assign/' . $shortsubtype . '/' .$plugin. '/db/install.xml', false); // Remove event handlers and dequeue pending events events_uninstall($this->subtype . '_' . $plugin);