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

moodle · Mar 23, 2022 · b46c643 · b46c643
2 parents 56c82a8 + ac24d90
commit b46c643
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/admin/tool/uploaduser/classes/process.php b/admin/tool/uploaduser/classes/process.php
@@ -692,7 +692,11 @@ public function process_line(array $line) {
             $dologout = false;
 
             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);
                     $existinguser->auth = $user->auth;
                     if (!isset($this->supportedauths[$user->auth])) {