moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 02:16:41 +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

4
admin/settings/users.php
View file

@ -127,7 +127,9 @@ if ($hassiteconfig
'firstaccess' => new lang_string('firstaccess'),
'lastaccess' => new lang_string('lastaccess'),
'mycourses' => new lang_string('mycourses'),
'groups' => new lang_string('groups'))));
'groups' => new lang_string('groups'),
'suspended' => new lang_string('suspended', 'auth'),
)));
// Select fields to display as part of user identity (only to those
// with moodle/site:viewuseridentity).