L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-52035 enrol_lti: Fixed default mail display setting

Browse Source
This commit is contained in:
Jun Pataleta
2016-04-27 14:12:29 +08:00
parent 33952d4a53
commit 26e8311287
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
enrol/lti/classes/helper.php
+7 -1
View File
@@ -110,7 +110,13 @@ class helper {
$user->country = (!empty($tool->country)) ? $tool->country : "";
$user->institution = (!empty($tool->institution)) ? $tool->institution : "";
$user->timezone = (!empty($tool->timezone)) ? $tool->timezone : "";
$user->maildisplay = (!empty($tool->maildisplay)) ? $tool->maildisplay : $CFG->defaultpreference_maildisplay;
if (isset($tool->maildisplay)) {
$user->maildisplay = $tool->maildisplay;
} else if (isset($CFG->defaultpreference_maildisplay)) {
$user->maildisplay = $CFG->defaultpreference_maildisplay;
} else {
$user->maildisplay = 2;
}
$user->mnethostid = $CFG->mnet_localhost_id;
$user->confirmed = 1;
$user->lang = $tool->lang;
enrol/lti/settings.php
+2 -1
View File
@@ -32,8 +32,9 @@ if ($ADMIN->fulltree) {
$choices = array(0 => get_string('emaildisplayno'),
1 => get_string('emaildisplayyes'),
2 => get_string('emaildisplaycourse'));
$maildisplay = isset($CFG->defaultpreference_maildisplay) ? $CFG->defaultpreference_maildisplay : 2;
$settings->add(new admin_setting_configselect('enrol_lti/emaildisplay', get_string('emaildisplay'), '',
$CFG->defaultpreference_maildisplay, $choices));
$maildisplay, $choices));
$city = '';
if (!empty($CFG->defaultcity)) {