MDL-56320 webservice: Allow uninstall of unused plugins

crazyserver · Dec 5, 2016 · 23b9e2a · 23b9e2a
1 parent 258d07d
commit 23b9e2a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/admin/tool/mobile/version.php b/admin/tool/mobile/version.php
@@ -26,3 +26,6 @@
 $plugin->version   = 2016052305; // The current plugin version (Date: YYYYMMDDXX).
 $plugin->requires  = 2016051900; // Requires this Moodle version.
 $plugin->component = 'tool_mobile'; // Full name of the plugin (used for diagnostics).
+$plugin->dependencies = array(
+    'webservice_rest' => 2016052300
+);
diff --git a/lib/classes/plugininfo/webservice.php b/lib/classes/plugininfo/webservice.php
@@ -79,6 +79,10 @@ public function load_settings(part_of_admin_tree $adminroot, $parentnodename, $h
     }
 
     public function is_uninstall_allowed() {
-        return false;
+        // The xmlrpc plugin contains webservice_xmlrpc_client (used by core).
+        if ($this->name == 'xmlrpc') {
+            return false;
+        }
+        return true;
     }
 }