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

reskit · Jun 15, 2022 · c6d752b · c6d752b
2 parents c3d4845 + 9394d56
commit c6d752b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/user/action_redir.php b/user/action_redir.php
@@ -101,7 +101,7 @@
 
                     // Retrieve all identity fields required for users.
                     $userfieldsapi = \core_user\fields::for_identity($context);
-                    $userfields = $userfieldsapi->get_sql('u', true, '', '', false);
+                    $userfields = $userfieldsapi->get_sql('u', true);
 
                     $identityfields = array_keys($userfields->mappings);
                     foreach ($identityfields as $field) {
@@ -141,7 +141,7 @@
                         $groupconcatjoin = '';
                     }
 
-                    $sql = "SELECT u.firstname, u.lastname, {$userfields->selects}
+                    $sql = "SELECT u.firstname, u.lastname {$userfields->selects}
                               FROM {user} u
                                    {$userfields->joins}
                               JOIN ({$enrolledsql}) je ON je.id = u.id