From d2d9d6087da4ba324d5f92c64e0c2a5c0180ecb2 Mon Sep 17 00:00:00 2001 From: Andrew Nicols Date: Fri, 29 Oct 2021 14:58:11 +0800 Subject: [PATCH] MDL-72615 boxnet: Correct upgrade step for boxnet removal --- lib/db/upgrade.php | 7 +++++-- version.php | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php index 0f430c7ac27..74720367d31 100644 --- a/lib/db/upgrade.php +++ b/lib/db/upgrade.php @@ -3040,7 +3040,7 @@ function xmldb_main_upgrade($oldversion) { upgrade_main_savepoint(true, 2021102600.01); } - if ($oldversion < 2021102900.00) { + if ($oldversion < 2021102900.02) { // If portfolio_boxnet is no longer present, remove it. if (!file_exists($CFG->dirroot . '/portfolio/boxnet/version.php')) { $instance = $DB->get_record('portfolio_instance', ['plugin' => 'boxnet']); @@ -3076,11 +3076,14 @@ function xmldb_main_upgrade($oldversion) { // Clean config. unset_all_config_for_plugin('repository_boxnet'); + // The boxnet repository plugin stores some config in 'boxnet' incorrectly. + unset_all_config_for_plugin('boxnet'); + // Remove orphaned files. upgrade_delete_orphaned_file_records(); } - upgrade_main_savepoint(true, 2021102900.00); + upgrade_main_savepoint(true, 2021102900.02); } return true; diff --git a/version.php b/version.php index 6a1a9c03eb1..a39bd7a939d 100644 --- a/version.php +++ b/version.php @@ -29,7 +29,7 @@ defined('MOODLE_INTERNAL') || die(); -$version = 2021102900.01; // YYYYMMDD = weekly release date of this DEV branch. +$version = 2021102900.02; // YYYYMMDD = weekly release date of this DEV branch. // RR = release increments - 00 in DEV branches. // .XX = incremental changes. $release = '4.0dev+ (Build: 20211026)'; // Human-friendly version name