summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorFrank Karlitschek <frank@owncloud.org>2012-06-01 14:21:24 +0200
committerFrank Karlitschek <frank@owncloud.org>2012-06-01 14:21:24 +0200
commitaa88ec81c792830d91771512d719dfc5f1a2893e (patch)
treea5ef59e82480a89aef0c0d05d99a9f64efc4401a /lib
parent86279bc192d72318540e312e637f9ecceb339a77 (diff)
downloadnextcloud-server-aa88ec81c792830d91771512d719dfc5f1a2893e.tar.gz
nextcloud-server-aa88ec81c792830d91771512d719dfc5f1a2893e.zip
sort users and groups. fixes oc-779
Diffstat (limited to 'lib')
-rw-r--r--lib/group.php2
-rw-r--r--lib/user.php1
2 files changed, 3 insertions, 0 deletions
diff --git a/lib/group.php b/lib/group.php
index 1e0216a932b..91772d510ff 100644
--- a/lib/group.php
+++ b/lib/group.php
@@ -233,6 +233,7 @@ class OC_Group {
$groups=array_merge($backend->getUserGroups($uid),$groups);
}
+ asort($groups);
return $groups;
}
@@ -250,6 +251,7 @@ class OC_Group {
$groups=array_merge($backend->getGroups(),$groups);
}
+ asort($groups);
return $groups;
}
diff --git a/lib/user.php b/lib/user.php
index 056d1307543..a62b0f96838 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -336,6 +336,7 @@ class OC_User {
}
}
}
+ asort($users);
return $users;
}