Merge branch 'MDL-26956' of git://github.com/timhunt/moodle

moodle · Apr 3, 2013 · c9f8620 · c9f8620
2 parents aed60c6 + d2e3212
commit c9f8620
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);
     }