Merge branch 'MDL-32350-master' of https://github.com/lucaboesch/moodle

This commit is contained in:
Jun Pataleta 2017-12-06 11:31:16 +13:00
commit b908c1add2

View File

@ -256,11 +256,17 @@
$users[$key]->country = $countries[$user->country];
}
}
if ($sort == "country") { // Need to resort by full country name, not code
if ($sort == "country") {
// Need to resort by full country name, not code.
foreach ($users as $user) {
$susers[$user->id] = $user->country;
}
asort($susers);
// Sort by country name, according to $dir.
if ($dir === 'DESC') {
arsort($susers);
} else {
asort($susers);
}
foreach ($susers as $key => $value) {
$nusers[] = $users[$key];
}