Merge branch 'MDL-32350-34' of https://github.com/lucaboesch/moodle into MOODLE_34_STABLE

2017-12-06 11:30:52 +13:00
parent e4256cd769 abd7d4394b
commit fd7e75a8a5
1 changed files with 8 additions and 2 deletions
@@ -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];
            }