[Pkg-owncloud-commits] [owncloud] 52/223: Revert "Merge pull request #8998 from macjohnny/master"

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit ab7cff6dfd63213746a29f4c0557e92a84561498
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Thu Jun 12 14:56:46 2014 +0200

    Revert "Merge pull request #8998 from macjohnny/master"
    
    This reverts commit 482eded8b31b257dfed7761c7cb43f35ddcd3408, reversing
    changes made to 354cace14ae01e7ff34af3c8a4a3335b89596da3.
---
 lib/private/group.php         |  7 ++++++-
 lib/private/group/manager.php | 12 ------------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/lib/private/group.php b/lib/private/group.php
index bd9e3d3..8dc3812 100644
--- 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 3613c75..dae6443 100644
--- 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git