Merge branch 'wip-79215-m311' into MOODLE_311_STABLE

# Conflicts: # local/o365/classes/feature/usersync/main.php
microsoft · Oct 21, 2021 · 5075c44 · 5075c44
2 parents d9f1852 + 07552d5
commit 5075c44
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/classes/feature/usersync/main.php b/classes/feature/usersync/main.php
@@ -543,7 +543,7 @@ public static function apply_configured_fieldmap(array $aaddata, \stdClass $user
                     break;
                 case 'preferredName':
                     if (!isset($aaddata[$remotefield])) {
-                        if (stripos($user->username, '_ext_') !== false) {
+                        if (stripos($aaddata['userPrincipalName'], '_ext_') !== false) {
                             $user->$localfield = $usersync->get_preferred_name($userobjectid);
                         }
                     }