aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@owncloud.com>2013-02-26 22:56:55 +0100
committerArthur Schiwon <blizzz@owncloud.com>2013-02-26 22:56:55 +0100
commit60d4fdda5780ea115ae4d051165256ce7de69783 (patch)
tree7d42dc147e6d09115d9952e76af02ce1fec860aa
parent64551ee06f2d33979c525a36455337aaca646d16 (diff)
downloadnextcloud-server-60d4fdda5780ea115ae4d051165256ce7de69783.tar.gz
nextcloud-server-60d4fdda5780ea115ae4d051165256ce7de69783.zip
sort users according to display name
-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;