From 61cd980fb7321f1d6acd78c1940d6ce4da6d1126 Mon Sep 17 00:00:00 2001 From: Paul Holden Date: Fri, 10 Mar 2023 16:19:12 +0000 Subject: [PATCH 1/2] MDL-77598 logstore_legacy: complete plugin uninstallation step. --- lib/db/upgrade.php | 10 ++++++++++ version.php | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php index 583ef1cda6a..0031cd73891 100644 --- a/lib/db/upgrade.php +++ b/lib/db/upgrade.php @@ -3118,5 +3118,15 @@ 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); + } + return true; } diff --git a/version.php b/version.php index f61c6a403a0..467637cedb4 100644 --- a/version.php +++ b/version.php @@ -29,7 +29,7 @@ defined('MOODLE_INTERNAL') || die(); -$version = 2023031000.00; // YYYYMMDD = weekly release date of this DEV branch. +$version = 2023031000.01; // YYYYMMDD = weekly release date of this DEV branch. // RR = release increments - 00 in DEV branches. // .XX = incremental changes. $release = '4.2dev (Build: 20230310)'; // Human-friendly version name From 9bf8699b7c99180a0fd01319086d9dfb2e0f31c8 Mon Sep 17 00:00:00 2001 From: Paul Holden Date: Fri, 10 Mar 2023 16:37:32 +0000 Subject: [PATCH 2/2] MDL-77598 editor_tinymce: ensure sub-plugins are also uninstalled. --- lib/db/upgrade.php | 14 ++++++++++++++ version.php | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php index 0031cd73891..2662f1ad7e5 100644 --- a/lib/db/upgrade.php +++ b/lib/db/upgrade.php @@ -3128,5 +3128,19 @@ privatefiles,moodle|/user/files.php'; 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')) { + $DB->delete_records_select( + 'config_plugins', + $DB->sql_like('plugin', ':plugin'), + ['plugin' => $DB->sql_like_escape('tinymce_') . '%'] + ); + } + + // Main savepoint reached. + upgrade_main_savepoint(true, 2023031000.02); + } + return true; } diff --git a/version.php b/version.php index 467637cedb4..c1d7010490f 100644 --- a/version.php +++ b/version.php @@ -29,7 +29,7 @@ defined('MOODLE_INTERNAL') || die(); -$version = 2023031000.01; // YYYYMMDD = weekly release date of this DEV branch. +$version = 2023031000.02; // YYYYMMDD = weekly release date of this DEV branch. // RR = release increments - 00 in DEV branches. // .XX = incremental changes. $release = '4.2dev (Build: 20230310)'; // Human-friendly version name