From d2e32121b085c64ed0f4d0a6b1eea4fea1d57c89 Mon Sep 17 00:00:00 2001 From: Tim Hunt Date: Wed, 3 Apr 2013 11:44:23 +0100 Subject: [PATCH] MDL-26956 user selector: fix regressions sam caused. --- lib/datalib.php | 2 +- user/selector/lib.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/datalib.php b/lib/datalib.php index c9f096af6965c..b5bcd3a5231eb 100644 --- a/lib/datalib.php +++ b/lib/datalib.php @@ -216,7 +216,7 @@ function search_users($courseid, $groupid, $searchtext, $sort='', array $excepti * parameters (using named placeholders). */ function users_search_sql($search, $u = 'u', $searchanywhere = true, array $extrafields = array(), - array $exclude = array(), array $includeonly = array()) { + array $exclude = null, array $includeonly = null) { global $DB, $CFG; $params = array(); $tests = array(); diff --git a/user/selector/lib.php b/user/selector/lib.php index 1483f6f8276e2..9692e3bb38843 100644 --- a/user/selector/lib.php +++ b/user/selector/lib.php @@ -434,7 +434,7 @@ protected function required_fields_sql($u) { * this uses ? style placeholders. */ protected function search_sql($search, $u) { - return users_search_sql($search, 'u', $this->searchanywhere, $this->extrafields, + return users_search_sql($search, $u, $this->searchanywhere, $this->extrafields, $this->exclude, $this->validatinguserids); }