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

2021-05-20 10:49:13 +08:00
parent da8787d68d dc9e6cb8f7
commit df7bbf713e
1 changed files with 5 additions and 1 deletions
@@ -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);
    }