summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/user.php2
-rw-r--r--settings/js/users.js4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/user.php b/lib/user.php
index 16f6d2787cb..cf6276f782b 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -530,7 +530,7 @@ class OC_User {
$displayNames = array_merge($displayNames, $backendDisplayNames);
}
}
- ksort($displayNames);
+ asort($displayNames);
return $displayNames;
}
diff --git a/settings/js/users.js b/settings/js/users.js
index 452bdf5f838..2c27c6d7666 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -116,9 +116,9 @@ var UserList = {
}
var added = false;
if (sort) {
- username = username.toLowerCase();
+ displayname = displayname.toLowerCase();
$('tbody tr').each(function () {
- if (username < $(this).attr('data-uid').toLowerCase()) {
+ if (displayname < $(this).attr('data-uid').toLowerCase()) {
$(tr).insertBefore($(this));
added = true;
return false;