From fa921f87f2d45350ee5e518bed17dfa0f0b657d6 Mon Sep 17 00:00:00 2001 From: Paul Holden Date: Mon, 3 Apr 2023 15:21:45 +0100 Subject: [PATCH] MDL-77686 logstore_legacy: final plugin uninstallation step. This supersedes the partial uninstallation from 61cd980f, ensuring we also now clear up any remaining data (e.g. scheduled tasks). --- lib/db/upgrade.php | 20 ++++++++++---------- version.php | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php index 66b822cc5de..1d5b6543d76 100644 --- a/lib/db/upgrade.php +++ b/lib/db/upgrade.php @@ -3118,16 +3118,6 @@ privatefiles,moodle|/user/files.php'; upgrade_main_savepoint(true, 2023030300.03); } - if ($oldversion < 2023031000.01) { - // If logstore_legacy is no longer present, remove it. - if (!file_exists($CFG->dirroot . '/admin/tool/log/store/legacy/version.php')) { - unset_all_config_for_plugin('logstore_legacy'); - } - - // Main savepoint reached. - upgrade_main_savepoint(true, 2023031000.01); - } - if ($oldversion < 2023031000.02) { // If editor_tinymce is no longer present, remove it's sub-plugins too. if (!file_exists($CFG->dirroot . '/lib/editor/tinymce/version.php')) { @@ -3215,5 +3205,15 @@ privatefiles,moodle|/user/files.php'; upgrade_main_savepoint(true, 2023032800.01); } + if ($oldversion < 2023040600.01) { + // If logstore_legacy is no longer present, remove it. + if (!file_exists($CFG->dirroot . '/admin/tool/log/store/legacy/version.php')) { + uninstall_plugin('logstore', 'legacy'); + } + + // Main savepoint reached. + upgrade_main_savepoint(true, 2023040600.01); + } + return true; } diff --git a/version.php b/version.php index 81f9e4d2b2d..62d92f9e045 100644 --- a/version.php +++ b/version.php @@ -29,7 +29,7 @@ defined('MOODLE_INTERNAL') || die(); -$version = 2023040600.00; // YYYYMMDD = weekly release date of this DEV branch. +$version = 2023040600.01; // YYYYMMDD = weekly release date of this DEV branch. // RR = release increments - 00 in DEV branches. // .XX = incremental changes. $release = '4.2dev+ (Build: 20230406)'; // Human-friendly version name