aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2016-05-06 14:25:30 +0200
committerVincent Petry <pvince81@owncloud.com>2016-05-06 14:25:30 +0200
commit47157bcd763c67c681b581ce81c78f5722bea074 (patch)
treee5ff0c4f06f27afea1e60b037f4c4ed900bc9a06
parentc9601efe9580fb36ac3dda211af943f52518ec36 (diff)
parent3c2fee87750e3137f2a33a60cb4cc53bf4933e45 (diff)
downloadnextcloud-server-47157bcd763c67c681b581ce81c78f5722bea074.tar.gz
nextcloud-server-47157bcd763c67c681b581ce81c78f5722bea074.zip
Merge pull request #24400 from owncloud/cache_shareManager
Cache shareManager
-rw-r--r--apps/dav/lib/connector/sabre/directory.php9
1 files changed, 5 insertions, 4 deletions
diff --git a/apps/dav/lib/connector/sabre/directory.php b/apps/dav/lib/connector/sabre/directory.php
index f31eff30b65..daa5f29ce79 100644
--- a/apps/dav/lib/connector/sabre/directory.php
+++ b/apps/dav/lib/connector/sabre/directory.php
@@ -64,9 +64,10 @@ class Directory extends \OCA\DAV\Connector\Sabre\Node
* @param \OC\Files\View $view
* @param \OCP\Files\FileInfo $info
* @param ObjectTree|null $tree
+ * @param \OCP\Share\IManager $shareManager
*/
- public function __construct($view, $info, $tree = null) {
- parent::__construct($view, $info);
+ public function __construct($view, $info, $tree = null, $shareManager = null) {
+ parent::__construct($view, $info, $shareManager);
$this->tree = $tree;
}
@@ -202,9 +203,9 @@ class Directory extends \OCA\DAV\Connector\Sabre\Node
}
if ($info['mimetype'] == 'httpd/unix-directory') {
- $node = new \OCA\DAV\Connector\Sabre\Directory($this->fileView, $info, $this->tree);
+ $node = new \OCA\DAV\Connector\Sabre\Directory($this->fileView, $info, $this->tree, $this->shareManager);
} else {
- $node = new \OCA\DAV\Connector\Sabre\File($this->fileView, $info);
+ $node = new \OCA\DAV\Connector\Sabre\File($this->fileView, $info, $this->shareManager);
}
if ($this->tree) {
$this->tree->cacheNode($node);