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

Merge branch 'wip-MDL-60926-34' of git://github.com/marinaglancy/moodle into MOODLE_34_STABLE

Browse Source
This commit is contained in:
Jun Pataleta
2017-12-05 19:03:36 +13:00
parent 5a6a4cef8b 605b0547de
commit e4256cd769
4 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/moodlelib.php
+3 -3
View File
@@ -3917,11 +3917,11 @@ function update_user_record_by_id($id) {
// Unknown or must not be changed.
continue;
}
$confval = $userauth->config->{'field_updatelocal_' . $key};
$lockval = $userauth->config->{'field_lock_' . $key};
if (empty($confval) || empty($lockval)) {
if (empty($userauth->config->{'field_updatelocal_' . $key}) || empty($userauth->config->{'field_lock_' . $key})) {
continue;
}
$confval = $userauth->config->{'field_updatelocal_' . $key};
$lockval = $userauth->config->{'field_lock_' . $key};
if ($confval === 'onlogin') {
// MDL-4207 Don't overwrite modified user profile values with
// empty LDAP values when 'unlocked if empty' is set. The purpose