From 2fdd4220f2c900345d01e51df49534eb6c9f1405 Mon Sep 17 00:00:00 2001 From: Jun Pataleta Date: Fri, 7 Mar 2025 17:35:09 +0800 Subject: [PATCH] MDL-84652 core: Properly uninstall mnetservice_enrol --- lib/db/upgrade.php | 18 +++++++++--------- version.php | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php index 98c5d25af67..0cd63e63eb5 100644 --- a/lib/db/upgrade.php +++ b/lib/db/upgrade.php @@ -1503,15 +1503,6 @@ function xmldb_main_upgrade($oldversion) { upgrade_main_savepoint(true, 2025030500.01); } - // Remove mnetservice_enrol. - if ($oldversion < 2025030600.01) { - if (!file_exists($CFG->dirroot . "/mnetservice/enrol/version.php")) { - uninstall_plugin('mnetservice', 'enrol'); - } - // Main savepoint reached. - upgrade_main_savepoint(true, 2025030600.01); - } - // Remove portfolio_mahara. if ($oldversion < 2025030600.02) { if (!file_exists($CFG->dirroot . "/portfolio/mahara/version.php")) { @@ -1592,5 +1583,14 @@ function xmldb_main_upgrade($oldversion) { upgrade_main_savepoint(true, 2025030600.07); } + // Remove mnetservice_enrol. + if ($oldversion < 2025030600.08) { + if (!file_exists($CFG->dirroot . "/mnet/service/enrol/version.php")) { + uninstall_plugin('mnetservice', 'enrol'); + } + // Main savepoint reached. + upgrade_main_savepoint(true, 2025030600.08); + } + return true; } diff --git a/version.php b/version.php index 56319b6984c..700a71166fb 100644 --- a/version.php +++ b/version.php @@ -29,7 +29,7 @@ defined('MOODLE_INTERNAL') || die(); -$version = 2025030600.07; // YYYYMMDD = weekly release date of this DEV branch. +$version = 2025030600.08; // YYYYMMDD = weekly release date of this DEV branch. // RR = release increments - 00 in DEV branches. // .XX = incremental changes. $release = '5.0dev+ (Build: 20250304)'; // Human-friendly version name