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

Merge branch 'w02_MDL-37064_m25_languser' of git://github.com/skodak/moodle

Browse Source
This commit is contained in:
Dan Poltawski
2013-01-15 13:36:44 +08:00
parent 9d40849d46 4d3cd1483d
commit cd7d79d3ab
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/tool/uploaduser/index.php
+17
View File
@@ -527,6 +527,16 @@ if ($formdata = $mform2->is_cancelled()) {
}
}
if ($column === 'lang') {
if (empty($user->lang)) {
// Do not change to not-set value.
continue;
} else if (clean_param($user->lang, PARAM_LANG) === '') {
$upt->track('status', get_string('cannotfindlang', 'error', $user->lang), 'warning');
continue;
}
}
if (in_array($column, $upt->columns)) {
$upt->track($column, s($existinguser->$column).'-->'.s($user->$column), 'info', false);
}
@@ -682,6 +692,13 @@ if ($formdata = $mform2->is_cancelled()) {
$upt->track('email', get_string('invalidemail'), 'warning');
}
if (empty($user->lang)) {
$user->lang = '';
} else if (clean_param($user->lang, PARAM_LANG) === '') {
$upt->track('status', get_string('cannotfindlang', 'error', $user->lang), 'warning');
$user->lang = '';
}
$forcechangepassword = false;
if ($isinternalauth) {