Merge branch 'MDL-87527-main' of https://github.com/yusufwib01/moodle
This commit is contained in:
@@ -116,7 +116,12 @@ if ($hassiteconfig) {
|
||||
$temp->add(new admin_setting_manageauths());
|
||||
$temp->add(new admin_setting_heading('manageauthscommonheading', new lang_string('commonsettings', 'admin'), ''));
|
||||
$temp->add(new admin_setting_special_registerauth());
|
||||
$temp->add(new admin_setting_configcheckbox('authloginviaemail', new lang_string('authloginviaemail', 'core_auth'), new lang_string('authloginviaemail_desc', 'core_auth'), 0));
|
||||
$temp->add(new admin_setting_configcheckbox(
|
||||
'authloginviaemail',
|
||||
new lang_string('authloginviaemail', 'core_auth'),
|
||||
new lang_string('authloginviaemail_desc', 'core_auth'),
|
||||
1,
|
||||
));
|
||||
$temp->add(new admin_setting_configcheckbox('allowaccountssameemail',
|
||||
new lang_string('allowaccountssameemail', 'core_auth'),
|
||||
new lang_string('allowaccountssameemail_desc', 'core_auth'), 0));
|
||||
|
||||
@@ -152,6 +152,8 @@ final class authlib_test extends \advanced_testcase {
|
||||
|
||||
// Test login via email
|
||||
$reason = null;
|
||||
// Explicitly disable email login for this test (MDL-87527: default is now enabled).
|
||||
set_config('authloginviaemail', 0);
|
||||
$this->assertEmpty($CFG->authloginviaemail);
|
||||
$sink = $this->redirectEvents();
|
||||
$result = authenticate_user_login('[email protected]', 'password1', false, $reason);
|
||||
|
||||
Reference in New Issue
Block a user