Merge branch 'MDL-46272-master' of https://github.com/lucisgit/moodle

This commit is contained in:
Sam Hemelryk 2014-07-28 13:07:27 +12:00
commit 9834bce700

View File

@ -63,10 +63,10 @@ class user_filtering {
}
if (empty($fieldnames)) {
$fieldnames = array('realname' => 0, 'lastname' => 1, 'firstname' => 1, 'email' => 1, 'city' => 1, 'country' => 1,
$fieldnames = array('realname' => 0, 'lastname' => 1, 'firstname' => 1, 'username' => 1, 'email' => 1, 'city' => 1, 'country' => 1,
'confirmed' => 1, 'suspended' => 1, 'profile' => 1, 'courserole' => 1, 'systemrole' => 1,
'cohort' => 1, 'firstaccess' => 1, 'lastaccess' => 1, 'neveraccessed' => 1, 'timemodified' => 1,
'nevermodified' => 1, 'username' => 1, 'auth' => 1, 'mnethostid' => 1);
'nevermodified' => 1, 'auth' => 1, 'mnethostid' => 1);
}
$this->_fields = array();