diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2017-03-14 20:13:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-14 20:13:09 +0100 |
| commit | 562c45d925a27b21f694a091029d87158364970c (patch) | |
| tree | c56830c43b58442e85a73920ffa222a1ddf8f7e6 | |
| parent | 25553172f4cf37632c039904c449ee69ce43fe6a (diff) | |
| parent | 16e1c21fcc9ce1cd19a22cec915356a82ae33925 (diff) | |
| download | nextcloud-server-562c45d925a27b21f694a091029d87158364970c.tar.gz nextcloud-server-562c45d925a27b21f694a091029d87158364970c.zip | |
Merge pull request #3829 from nextcloud/reshares-in-folder
switch reshares to true (display reshares in the folder/filelist)
| -rw-r--r-- | apps/dav/lib/Connector/Sabre/SharesPlugin.php | 2 | ||||
| -rw-r--r-- | apps/dav/tests/unit/Connector/Sabre/SharesPluginTest.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/dav/lib/Connector/Sabre/SharesPlugin.php b/apps/dav/lib/Connector/Sabre/SharesPlugin.php index 4df8c9f85a5..2b640d74fd4 100644 --- a/apps/dav/lib/Connector/Sabre/SharesPlugin.php +++ b/apps/dav/lib/Connector/Sabre/SharesPlugin.php @@ -143,7 +143,7 @@ class SharesPlugin extends \Sabre\DAV\ServerPlugin { $shares = $this->shareManager->getSharesInFolder( $this->userId, $node, - false + true ); $shareTypesByFileId = []; diff --git a/apps/dav/tests/unit/Connector/Sabre/SharesPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/SharesPluginTest.php index 9d8a66f24b6..2b4a886050a 100644 --- a/apps/dav/tests/unit/Connector/Sabre/SharesPluginTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/SharesPluginTest.php @@ -235,7 +235,7 @@ class SharesPluginTest extends \Test\TestCase { ->with( $this->equalTo('user1'), $this->anything(), - $this->equalTo(false) + $this->equalTo(true) ) ->will($this->returnCallback(function ($userId, $node, $flag) use ($shareTypes, $dummyShares) { return [111 => $dummyShares]; |