Merge branch 'wip-MDL-50851-master' of git://github.com/marinaglancy/moodle

2016-01-12 14:17:14 +00:00
parent b8ab80f07e 3da0c3cbf4
commit 04a03ff282
129 changed files with 8174 additions and 3027 deletions
@@ -166,9 +166,8 @@ function uninstall_plugin($type, $name) {

    echo $OUTPUT->heading($pluginname);

-    // Delete all tag instances associated with this plugin.
-    require_once($CFG->dirroot . '/tag/lib.php');
-    tag_delete_instances($component);
+    // Delete all tag areas, collections and instances associated with this plugin.
+    core_tag_area::uninstall($component);

    // Custom plugin uninstall.
    $plugindirectory = core_component::get_plugin_directory($type, $name);