From fc07f6adbc59786af1f107a8ffba2ea67fe4fd6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luca=20B=C3=B6sch?= <luca.boesch@bfh.ch>
Date: Tue, 28 Nov 2017 22:01:52 +0100
Subject: [PATCH] MDL-32350 admin: Sort users by country ASC and DESC

---
 admin/user.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/admin/user.php b/admin/user.php
index 65bf4e63ec9..ac0f5f94cb6 100644
--- a/admin/user.php
+++ b/admin/user.php
@@ -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];
             }