mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3829 from nextcloud/reshares-in-folder 

switch reshares to true (display reshares in the folder/filelist)
This commit is contained in:
Roeland Jago Douma 2017-03-14 20:13:09 +01:00 committed by GitHub
parent 25553172f4 16e1c21fcc
commit 562c45d925
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/dav/lib/Connector/Sabre/SharesPlugin.php
View File

@ -143,7 +143,7 @@ class SharesPlugin extends \Sabre\DAV\ServerPlugin {
$shares = $this->shareManager->getSharesInFolder( $shares = $this->shareManager->getSharesInFolder(
$this->userId, $this->userId,
$node, $node,
false true
); );
$shareTypesByFileId = []; $shareTypesByFileId = [];

2
apps/dav/tests/unit/Connector/Sabre/SharesPluginTest.php
View File

@ -235,7 +235,7 @@ class SharesPluginTest extends \Test\TestCase {
->with( ->with(
$this->equalTo('user1'), $this->equalTo('user1'),
$this->anything(), $this->anything(),
$this->equalTo(false) $this->equalTo(true)
) )
->will($this->returnCallback(function ($userId, $node, $flag) use ($shareTypes, $dummyShares) { ->will($this->returnCallback(function ($userId, $node, $flag) use ($shareTypes, $dummyShares) {
return [111 => $dummyShares]; return [111 => $dummyShares];