Merge branch 'master' of git.kde.org:owncloud

2 files changed, 7 insertions, 7 deletions

diff --git a/lib/base.php b/lib/base.php
index 520c12d4df1..d02f63a2766 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -35,23 +35,23 @@ class OC{
 	 */
 	public static $DOCUMENTROOT = '';
 	/**
-	 * TODO: What's this for?
+	 * The installation path for owncloud on the server (e.g. /srv/http/owncloud)
 	 */
 	public static $SERVERROOT = '';
 	/**
-	 * TODO: What's this for?
+	 * the current request path relative to the owncloud root (e.g. files/index.php)
 	 */
 	public static $SUBURI = '';
 	/**
-	 * TODO: What's this for?
+	 * the owncloud root path for http requests (e.g. owncloud/)
 	 */
 	public static $WEBROOT = '';
 	/**
-	 * TODO: What's this for?
+	 * the folder that stores that data files for the filesystem of the user (e.g. /srv/http/owncloud/data/myusername/files)
 	 */
 	public static $CONFIG_DATADIRECTORY = '';
 	/**
-	 * TODO: What's this for?
+	 * the folder that stores the data for the root filesystem (e.g. /srv/http/owncloud/data)
 	 */
 	public static $CONFIG_DATADIRECTORY_ROOT = '';
 
diff --git a/lib/connector/sabre/principal.php b/lib/connector/sabre/principal.php
index b3070087fd7..9c386f85e15 100644
--- a/lib/connector/sabre/principal.php
+++ b/lib/connector/sabre/principal.php
@@ -37,8 +37,8 @@ class OC_Connector_Sabre_Principal implements Sabre_DAVACL_IPrincipalBackend {
 		// We have to delete the principals and relations! Principals include 
 		while($row = $result->fetchRow()){
 			// Checking if the principal is in the prefix
-			list($rowPrefix,$rowUser) = Sabre_DAV_URLUtil::splitPath($row['uri']);
-			if ($rowUser !== $params['uid']) continue;
+			$array = explode('/',$row['uri']);
+			if ($array[1] != $params['uid']) continue;
 			$deleteprincipal->execute(array($row['id']));
 			$deletegroup->execute(array($row['id'],$row['id']));
 		}