sort users and groups. fixes oc-779

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