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

Merge branch 'MDL-57383' of https://github.com/paulholden/moodle

Browse source
This commit is contained in:
Sara Arjona 2022-03-23 13:51:08 +01:00
commit b46c643276
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
admin/tool/uploaduser/classes/process.php
View file

@ -692,7 +692,11 @@ class process {
$dologout = false; $dologout = false;
if ($this->get_update_type() != UU_UPDATE_NOCHANGES and !$remoteuser) { if ($this->get_update_type() != UU_UPDATE_NOCHANGES and !$remoteuser) {
if (!empty($user->auth) and $user->auth !== $existinguser->auth) {
// Handle 'auth' column separately, the field can never be missing from a user.
if (!empty($user->auth) && ($user->auth !== $existinguser->auth) &&
($this->get_update_type() != UU_UPDATE_MISSING)) {
$this->upt->track('auth', s($existinguser->auth).'-->'.s($user->auth), 'info', false); $this->upt->track('auth', s($existinguser->auth).'-->'.s($user->auth), 'info', false);
$existinguser->auth = $user->auth; $existinguser->auth = $user->auth;
if (!isset($this->supportedauths[$user->auth])) { if (!isset($this->supportedauths[$user->auth])) {