Merge branch 'nextcloud-12' into develop

strukturag · May 11, 2017 · 9e84b8a · meenu727 · Sep 19, 2019 · 9e84b8a
2 parents b6e2d34 + c687720
commit 9e84b8a
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/user/user.php b/user/user.php
@@ -75,8 +75,15 @@ private function getDisplayName() {
 	private function getGroups() {
 		$this->requireLogin();
 
-		// TODO(leon): This looks like a private API.
-		return \OC_Group::getUserGroups($this->getUserId());
+		if (class_exists('\OC_Group', true)) {
+			// Nextcloud <= 11, ownCloud
+			return \OC_Group::getUserGroups($this->getUserId());
+		}
+		// Nextcloud >= 12
+		$groups = \OC::$server->getGroupManager()->getUserGroups(\OC::$server->getUserSession()->getUser());
+		return array_map(function ($group) {
+			return $group->getGID();
+		}, $groups);
 	}
 
 	private function getAdministeredGroups() {