From e2a6530ad2104e1e60d18b62cad7b9b389a00fcf Mon Sep 17 00:00:00 2001 From: Paul Holden Date: Wed, 9 Aug 2023 22:27:01 +0100 Subject: [PATCH] MDL-78961 admin: correct smtppass preset configuration name. --- admin/settings/security.php | 2 +- lib/db/upgrade.php | 13 +++++++++++++ version.php | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/admin/settings/security.php b/admin/settings/security.php index f4dfde50952..3e4b5c723f6 100644 --- a/admin/settings/security.php +++ b/admin/settings/security.php @@ -145,7 +145,7 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page $temp->add(new admin_setting_heading('adminpresets', new lang_string('siteadminpresetspluginname', 'core_adminpresets'), '')); $sensiblesettingsdefault = 'recaptchapublickey@@none, recaptchaprivatekey@@none, googlemapkey3@@none, '; $sensiblesettingsdefault .= 'secretphrase@@url, cronremotepassword@@none, smtpuser@@none, '; - $sensiblesettingsdefault .= 'smtppass@none, proxypassword@@none, quizpassword@@quiz, allowedip@@none, blockedip@@none, '; + $sensiblesettingsdefault .= 'smtppass@@none, proxypassword@@none, quizpassword@@quiz, allowedip@@none, blockedip@@none, '; $sensiblesettingsdefault .= 'dbpass@@logstore_database, messageinbound_hostpass@@none, '; $sensiblesettingsdefault .= 'bind_pw@@auth_cas, pass@@auth_db, bind_pw@@auth_ldap, '; $sensiblesettingsdefault .= 'dbpass@@enrol_database, bind_pw@@enrol_ldap, '; diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php index c67eb530610..14d1a885fc4 100644 --- a/lib/db/upgrade.php +++ b/lib/db/upgrade.php @@ -3290,5 +3290,18 @@ privatefiles,moodle|/user/files.php'; upgrade_main_savepoint(true, 2023042401.09); } + if ($oldversion < 2023042402.03) { + + // The previous default configuration had a typo, check for its presence and correct if necessary. + $sensiblesettings = get_config('adminpresets', 'sensiblesettings'); + if (strpos($sensiblesettings, 'smtppass@none') !== false) { + $newsensiblesettings = str_replace('smtppass@none', 'smtppass@@none', $sensiblesettings); + set_config('sensiblesettings', $newsensiblesettings, 'adminpresets'); + } + + // Main savepoint reached. + upgrade_main_savepoint(true, 2023042402.03); + } + return true; } diff --git a/version.php b/version.php index a9aafab4b6e..0d1e6eae2f4 100644 --- a/version.php +++ b/version.php @@ -29,7 +29,7 @@ defined('MOODLE_INTERNAL') || die(); -$version = 2023042402.02; // 20230424 = branching date YYYYMMDD - do not modify! +$version = 2023042402.03; // 20230424 = branching date YYYYMMDD - do not modify! // RR = release increments - 00 in DEV branches. // .XX = incremental changes. $release = '4.2.2+ (Build: 20230822)'; // Human-friendly version name