Skip to content

Commit

Permalink
MDL-29803 report/logs - don't retrieve all users uncessarily
Browse files Browse the repository at this point in the history
Also remove uncessary retrieval of idnumber

Helps display the main logs page on large sites without running out of
memory
  • Loading branch information
danpoltawski committed Nov 1, 2011
1 parent 9de8774 commit 541a997
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions course/report/log/lib.php
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,12 @@ function print_log_selector_form($course, $selecteduser=0, $selecteddate='today'
// Get all the possible users
$users = array();

$courseusers = get_enrolled_users($context, '', $selectedgroup, 'u.id, u.firstname, u.lastname, u.idnumber', 'lastname ASC, firstname ASC');
// Define limitfrom and limitnum for queries below
// If $showusers is enabled... don't apply limitfrom and limitnum
$limitfrom = empty($showusers) ? 0 : '';
$limitnum = empty($showusers) ? COURSE_MAX_USERS_PER_DROPDOWN + 1 : '';

$courseusers = get_enrolled_users($context, '', $selectedgroup, 'u.id, u.firstname, u.lastname', 'lastname ASC, firstname ASC', $limitfrom, $limitnum);

if (count($courseusers) < COURSE_MAX_USERS_PER_DROPDOWN && !$showusers) {
$showusers = 1;
Expand Down Expand Up @@ -552,4 +557,4 @@ function log_page_type_list($pagetype, $parentcontext, $currentcontext) {
//course-report-log-live not included as theres no blocks on the live log page
);
return $array;
}
}

0 comments on commit 541a997

Please sign in to comment.