avoid warnings for first column of query results not unique

microsoft · Oct 20, 2021 · 73e662d · 73e662d
1 parent 7a704ab
commit 73e662d
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/classes/feature/usersync/main.php b/classes/feature/usersync/main.php
@@ -895,13 +895,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,';
-            $where = ' WHERE u.email';
-        } else {
-            $select = 'SELECT LOWER(u.username) AS username,';
-            $where = ' WHERE u.username';
+            $select .= ' LOWER(u.email) AS email,';
         }
 
         list($usernamesql, $usernameparams) = $DB->get_in_or_equal($usernames);