L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-6041 - Proper fix that eliminates the magic number 99999 when getting lists of studnets. Now, there is no arbitrary upper limit in the datalib functions, and sensible upper limits on pages that display lists of users. However, if you try to get all the site students, then get_students prints a warning in debug mode, telling you that you need to rethink your code.

Browse Source 
Also a few more ISNULL()s eliminated.

And a typo role_assignment -> role_assignments.
This commit is contained in:
tjhunt
2006-09-15 14:32:35 +00:00
parent 4b10f08b88
commit 36075e092d
8 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/admin.php
+3 -7
View File
@@ -91,25 +91,21 @@
unset($adminarray);
$usercount = get_users(false, '', true, $adminlist);
/// Get search results excluding any current admins
if (!empty($frm->searchtext) and $previoussearch) {
$searchusers = get_users(true, $frm->searchtext, true, $adminlist, 'firstname ASC, lastname ASC',
'', '', 0, 99999, 'id, firstname, lastname, email');
$usercount = get_users(false, '', true, $adminlist);
'', '', 0, MAX_USERS_PER_PAGE, 'id, firstname, lastname, email');
}
/// If no search results then get potential users excluding current admins
if (empty($searchusers)) {
$usercount = get_users(false, '', true, $adminlist, 'firstname ASC, lastname ASC', '', '',
0, 99999, 'id, firstname, lastname, email');
$users = array();
if ($usercount <= MAX_USERS_PER_PAGE) {
if (!$users = get_users(true, '', true, $adminlist, 'firstname ASC, lastname ASC', '', '',
0, 99999, 'id, firstname, lastname, email') ) {
0, MAX_USERS_PER_PAGE, 'id, firstname, lastname, email') ) {
$users = array();
}
}