wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #24400 from owncloud/cache_shareManager

Browse source 
Cache shareManager
This commit is contained in:
Vincent Petry 2016-05-06 14:25:30 +02:00
commit 47157bcd76
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/dav/lib/connector/sabre/directory.php
View file

@ -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);