moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 18:36:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merged branch 'w52_MDL-30548_m23_suspenduser' of git://github.com/skodak/moodle.git with conflict resolution

Browse source
This commit is contained in:
Sam Hemelryk 2012-01-04 10:50:20 +13:00
commit 44d5c138a2
11 changed files with 150 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/datalib.php
View file

@ -314,7 +314,7 @@ function get_users_listing($sort='lastaccess', $dir='ASC', $page=0, $recordsperp
// warning: will return UNCONFIRMED USERS
return $DB->get_records_sql("SELECT id, username, email, firstname, lastname, city, country,
lastaccess, confirmed, mnethostid$extrafields
lastaccess, confirmed, mnethostid, suspended $extrafields
FROM {user}
WHERE $select
$sort", $params, $page, $recordsperpage);