Merge pull request #5494 from owncloud/fixing-3593-master

introducing new dav property {xmlns:oc="http://owncloud.org/ns}id

1 files changed, 22 insertions, 1 deletions

diff --git a/lib/private/connector/sabre/node.php b/lib/private/connector/sabre/node.php
index 3c2ad60f1dd..76fbc251100 100644
--- a/lib/private/connector/sabre/node.php
+++ b/lib/private/connector/sabre/node.php
@@ -45,6 +45,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 	 * @var string
 	 */
 	protected $path;
+
 	/**
 	 * node fileinfo cache
 	 * @var array
@@ -211,6 +212,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 	 * properties should be returned
 	 */
 	public function getProperties($properties) {
+
 		if (is_null($this->property_cache)) {
 			$sql = 'SELECT * FROM `*PREFIX*properties` WHERE `userid` = ? AND `propertypath` = ?';
 			$result = OC_DB::executeAudited( $sql, array( OC_User::getUser(), $this->path ) );
@@ -236,8 +238,11 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 
 		$props = array();
 		foreach($properties as $property) {
-			if (isset($this->property_cache[$property])) $props[$property] = $this->property_cache[$property];
+			if (isset($this->property_cache[$property])) {
+				$props[$property] = $this->property_cache[$property];
+			}
 		}
+
 		return $props;
 	}
 
@@ -260,4 +265,20 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 		}
 		return $this->fileView;
 	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getFileId()
+	{
+		$this->getFileinfoCache();
+
+		if (isset($this->fileinfo_cache['fileid'])) {
+			$instanceId = OC_Util::getInstanceId();
+			$id = sprintf('%08d', $this->fileinfo_cache['fileid']);
+			return $instanceId . $id;
+		}
+
+		return null;
+	}
 }