moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-67883-squash' of https://github.com/Chocolate-lightning/moodle

Browse source
This commit is contained in:
Jun Pataleta 2020-06-05 11:52:36 +08:00
commit 618b13e1f5
87 changed files with 5262 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

3
admin/settings/subsystems.php
View file

@ -74,7 +74,4 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
new lang_string('configallowemojipickerincompatible', 'admin')
));
}
$optionalsubsystems->add(new admin_setting_configcheckbox('enablemoodlenet', new lang_string('enablemoodlenet', 'admin'),
new lang_string('enablemoodlenet_desc', 'admin'), 1, 1, 0));
}

1
admin/settings/users.php
View file

@ -186,6 +186,7 @@ if ($hassiteconfig
'email' => new lang_string('email'),
'city' => new lang_string('city'),
'country' => new lang_string('country'),
'moodlenetprofile' => new lang_string('moodlenetprofile', 'user'),
'timezone' => new lang_string('timezone'),
'webpage' => new lang_string('webpage'),
'icqnumber' => new lang_string('icqnumber'),