From: Frank Karlitschek <frank@owncloud.org>
Date: Fri, 1 Jun 2012 12:18:14 +0000 (+0200)
Subject: sort users and groups.  fixes oc-779
X-Git-Tag: v4.5.0beta1~74^2~425^2~13
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ad6562d14fabb0822e197e2ed70e4a3f8c02e23f;p=nextcloud-server.git

sort users and groups.  fixes oc-779
---

diff --git a/lib/group.php b/lib/group.php
index a78eb51fff0..7967e1a581b 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 ee2a80b1599..d7e9bf1a64c 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -336,6 +336,7 @@ class OC_User {
 				}
 			}
 		}
+		asort($users);
 		return $users;
 	}