From a73409d34ed75b77e7aacf96ce56f67aa593d40c Mon Sep 17 00:00:00 2001 From: Cameron Ball Date: Wed, 13 Jan 2016 13:48:06 +0800 Subject: [PATCH] MDL-52210 webservices: Revise upgrade version number. --- lib/db/upgrade.php | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php index 7a306e99d81..3c1e97064c3 100644 --- a/lib/db/upgrade.php +++ b/lib/db/upgrade.php @@ -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 < 2016011100.16) { + + // 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; }