From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 15 Jun 2012 15:04:37 +0000 (+0200)
Subject: Use setter for FileinfoCache
X-Git-Tag: v4.5.0beta1~74^2~419^2~10
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=27efdbd58f284c054ae9150ff2a2b0dcb5fab70f;p=nextcloud-server.git

Use setter for FileinfoCache
---

diff --git a/lib/connector/sabre/directory.php b/lib/connector/sabre/directory.php
index 5aa70392d76..6af4dd36562 100644
--- a/lib/connector/sabre/directory.php
+++ b/lib/connector/sabre/directory.php
@@ -69,15 +69,13 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
 		if (!$info) throw new Sabre_DAV_Exception_NotFound('File with name ' . $path . ' could not be located');
 
 		if ($info['mimetype'] == 'httpd/unix-directory') {
-
-			return new OC_Connector_Sabre_Directory($path, $info);
-
+			$node = new OC_Connector_Sabre_Directory($path);
 		} else {
-
-			return new OC_Connector_Sabre_File($path, $info);
-
+			$node = new OC_Connector_Sabre_File($path);
 		}
 
+		$node->setFileinfoCache($info);
+		return $node;
 	}
 
 	/**
diff --git a/lib/connector/sabre/node.php b/lib/connector/sabre/node.php
index e5c059f0c8a..8a860242f28 100644
--- a/lib/connector/sabre/node.php
+++ b/lib/connector/sabre/node.php
@@ -41,11 +41,8 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 	 * @param string $path
 	 * @return void
 	 */
-	public function __construct($path, $fileinfo_cache = null) {
+	public function __construct($path) {
 		$this->path = $path;
-		if ($fileinfo_cache) {
-			$this->fileinfo_cache = $fileinfo_cache;
-		}
 	}
 
 
@@ -85,8 +82,13 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 
 	}
 
+	public function setFileinfoCache($fileinfo_cache)
+	{
+		$this->fileinfo_cache = $fileinfo_cache;
+	}
+
 	/**
-	 * Set the stat cache
+	 * Make sure the fileinfo cache is filled. Uses OC_FileCache or a direct stat
 	 */
 	protected function getFileinfoCache() {
 		if (!isset($this->fileinfo_cache)) {