MDL-84652 core: Properly uninstall mnetservice_enrol

Author: junpataleta

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;
 }

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