From 3c2fee87750e3137f2a33a60cb4cc53bf4933e45 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Mon, 2 May 2016 22:18:14 +0200 Subject: [PATCH] Cache shareManager There is no need to call \OC::$server->getShareManager for each Node. We have it available so better pass it around. --- apps/dav/lib/connector/sabre/directory.php | 9 +++++---- 1 file 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);