MDL-71647 user: allow searching user selector by identity fields.

Fixes regression from d916cd77, which passed empty extra fields when
not including custom fields.
This commit is contained in:
Paul Holden 2021-05-17 16:01:07 +01:00
parent 0b69b37f04
commit dc9e6cb8f7

View File

@ -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);
}