Revert "Merge pull request #8998 from macjohnny/master"

This reverts commit 482eded8b31b257dfed7761c7cb43f35ddcd3408, reversing
changes made to 354cace14ae01e7ff34af3c8a4a3335b89596da3.

diff --git a/lib/private/group.php b/lib/private/group.php
index bd9e3d37d1f5f60b8d9d2fd5decfe5122f9b005a..8dc381292052ce75fb24dfa08c9db9e3d55701ba 100644 (file)
--- a/lib/private/group.php
+++ b/lib/private/group.php
@@ -187,7 +187,12 @@ class OC_Group {
        public static function getUserGroups($uid) {
                $user = self::$userManager->get($uid);
                if ($user) {
-                       return self::getManager()->getUserGroupIds($user);
+                       $groups = self::getManager()->getUserGroups($user);
+                       $groupIds = array();
+                       foreach ($groups as $group) {
+                               $groupIds[] = $group->getGID();
+                       }
+                       return $groupIds;
                } else {
                        return array();
                }

diff --git a/lib/private/group/manager.php b/lib/private/group/manager.php
index 3613c7547bdcb85e37a2b66841415c38d8b65133..dae6443e9d488a61f80a756950e80ad80c273f04 100644 (file)
--- a/lib/private/group/manager.php
+++ b/lib/private/group/manager.php
@@ -182,18 +182,6 @@ class Manager extends PublicEmitter {
                $this->cachedUserGroups[$uid] = array_values($groups);
                return $this->cachedUserGroups[$uid];
        }
-       /**
-        * @param \OC\User\User $user
-        * @return array with group names
-        */
-       public function getUserGroupIds($user) {
-               $groupIds = array();
-               foreach ($this->backends as $backend) {
-                       $groupIds = array_merge($groupIds, $backend->getUserGroups($user->getUID()));
-                       
-               }
-               return $groupIds;
-       }
 
        /**
         * get a list of all display names in a group