Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
integration
prechecker
Commits
b908c1ad
Commit
b908c1ad
authored
Dec 06, 2017
by
jun
Browse files
Merge branch 'MDL-32350-master' of
https://github.com/lucaboesch/moodle
parents
1396cb63
fc07f6ad
Changes
1
Hide whitespace changes
Inline
Side-by-side
admin/user.php
View file @
b908c1ad
...
...
@@ -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
];
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment