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

This commit is contained in:
Eloy Lafuente (stronk7) 2013-04-03 13:20:23 +02:00
commit c9f8620492
2 changed files with 2 additions and 2 deletions

View File

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

View File

@ -434,7 +434,7 @@ abstract class user_selector_base {
* 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);
}