Commit 939d538c authored by Dan Poltawski's avatar Dan Poltawski
Browse files

Merge branch 'MDL-52210-master-2' of git://github.com/cameron1729/moodle

parents a0418089 a73409d3
......@@ -4606,17 +4606,6 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2015100800.01);
}
if ($oldversion < 2015123100.01) {
// Force uninstall of deleted tool.
if (!file_exists("$CFG->dirroot/webservice/amf")) {
// Remove capabilities.
capabilities_cleanup('webservice_amf');
// Remove all other associated config.
unset_all_config_for_plugin('webservice_amf');
}
upgrade_main_savepoint(true, 2015123100.01);
}
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
......@@ -4806,5 +4795,17 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2016011100.15);
}
if ($oldversion < 2016011200.00) {
// Force uninstall of deleted tool.
if (!file_exists("$CFG->dirroot/webservice/amf")) {
// Remove capabilities.
capabilities_cleanup('webservice_amf');
// Remove all other associated config.
unset_all_config_for_plugin('webservice_amf');
}
upgrade_main_savepoint(true, 2016011100.16);
}
return true;
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment