sort users according to display name

diff --git a/lib/user.php b/lib/user.php
index 16f6d2787cbb0ebaf0da818a63ac76653e10ab5e..cf6276f782b7203b9bca4c608a5bda1ac8d2c963 100644 (file)
--- 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 452bdf5f838392b6fd527d32e8fb3a7a9fc8f930..2c27c6d7666203c94b6a4db9c21cdb80461844e1 100644 (file)
--- 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;