From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 18 Aug 2013 13:53:52 +0000 (+0200)
Subject: Port DAV groupMemberSet fix to master #4458
X-Git-Tag: v6.0.0alpha2~295
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3366bbeb8a91db9dd7f592bce8760156a23c0530;p=nextcloud-server.git

Port DAV groupMemberSet fix to master #4458
---

diff --git a/lib/connector/sabre/principal.php b/lib/connector/sabre/principal.php
index 16c88b96ea6..59a96797c16 100644
--- a/lib/connector/sabre/principal.php
+++ b/lib/connector/sabre/principal.php
@@ -66,13 +66,13 @@ class OC_Connector_Sabre_Principal implements Sabre_DAVACL_IPrincipalBackend {
 	 */
 	public function getGroupMemberSet($principal) {
 		// TODO: for now the group principal has only one member, the user itself
-		list($prefix, $name) = Sabre_DAV_URLUtil::splitPath($principal);
-
-		$principal = $this->getPrincipalByPath($prefix);
-		if (!$principal) throw new Sabre_DAV_Exception('Principal not found');
+		$principal = $this->getPrincipalByPath($principal);
+		if (!$principal) {
+			throw new Sabre_DAV_Exception('Principal not found');
+		}
 
 		return array(
-			$prefix
+			$principal['uri']
 		);
 	}
 
@@ -88,7 +88,9 @@ class OC_Connector_Sabre_Principal implements Sabre_DAVACL_IPrincipalBackend {
 		$group_membership = array();
 		if ($prefix == 'principals') {
 			$principal = $this->getPrincipalByPath($principal);
-			if (!$principal) throw new Sabre_DAV_Exception('Principal not found');
+			if (!$principal) {
+				throw new Sabre_DAV_Exception('Principal not found');
+			}
 
 			// TODO: for now the user principal has only its own groups
 			return array(