From dc9e6cb8f7e301fd285650a61cbb594012397e42 Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Mon, 17 May 2021 16:01:07 +0100
Subject: [PATCH] MDL-71647 user: allow searching user selector by identity
fields.
Fixes regression from d916cd77, which passed empty extra fields when
not including custom fields.
---
user/selector/lib.php | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/user/selector/lib.php b/user/selector/lib.php
index d2deb0a0a2d..a29bf3ff1a5 100644
--- a/user/selector/lib.php
+++ b/user/selector/lib.php
@@ -494,7 +494,11 @@ abstract class user_selector_base {
* this uses ? style placeholders.
*/
protected function search_sql(string $search, string $u): array {
- return users_search_sql($search, $u, $this->searchanywhere, array_values($this->userfieldsmappings),
+ $extrafields = $this->includecustomfields
+ ? array_values($this->userfieldsmappings)
+ : $this->extrafields;
+
+ return users_search_sql($search, $u, $this->searchanywhere, $extrafields,
$this->exclude, $this->validatinguserids);
}