From 9394d5618d8fbeb449aaa872aade4621e2f92db2 Mon Sep 17 00:00:00 2001 From: Paul Holden Date: Mon, 6 Jun 2022 21:10:42 +0100 Subject: [PATCH] MDL-74871 user: account for absense of identity fields during export. --- user/action_redir.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user/action_redir.php b/user/action_redir.php index 507374f92f6..f5eb605375a 100644 --- a/user/action_redir.php +++ b/user/action_redir.php @@ -101,7 +101,7 @@ if ($formaction == 'bulkchange.php') { // 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 @@ if ($formaction == 'bulkchange.php') { $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