diff --git a/admin/settings/security.php b/admin/settings/security.php index bc6c9ea8a6f..081da82d56c 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 76aec2b74b9..4de7a3dffbe 100644 --- a/lib/db/upgrade.php +++ b/lib/db/upgrade.php @@ -3535,5 +3535,17 @@ privatefiles,moodle|/user/files.php'; upgrade_main_savepoint(true, 2023082600.02); } + if ($oldversion < 2023082600.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, 2023082600.03); + } + return true; } diff --git a/version.php b/version.php index 5b2302debcc..33774f30a15 100644 --- a/version.php +++ b/version.php @@ -29,7 +29,7 @@ defined('MOODLE_INTERNAL') || die(); -$version = 2023082600.02; // YYYYMMDD = weekly release date of this DEV branch. +$version = 2023082600.03; // YYYYMMDD = weekly release date of this DEV branch. // RR = release increments - 00 in DEV branches. // .XX = incremental changes. $release = '4.3dev+ (Build: 20230826)'; // Human-friendly version name