Merge branch 'wip-79222-m311' into MOODLE_311_STABLE

# Conflicts: # local/o365/classes/feature/usersync/main.php
microsoft · Oct 21, 2021 · cd437d3 · cd437d3
2 parents 5075c44 + 73e662d
commit cd437d3
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/classes/feature/usersync/main.php b/classes/feature/usersync/main.php
@@ -910,11 +910,9 @@ public function sync_users(array $aadusers = array()) {
             return true;
         }
 
+        $select = 'SELECT LOWER(u.username) AS username,';
         if (isset($aadsync['emailsync'])) {
-            $select = 'SELECT LOWER(u.email) AS email,
-                       LOWER(u.username) AS username,';
-        } else {
-            $select = 'SELECT LOWER(u.username) AS username,';
+            $select .= ' LOWER(u.email) AS email,';
         }
 
         $sql = "$select