diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2017-01-02 21:19:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-02 21:19:43 +0100 |
| commit | fdf10e242d39d0bc4b4b7fef8ead5589c549763d (patch) | |
| tree | f525a1574e1f47b93379fa10e51d2a4768fb4924 /apps/dav | |
| parent | 8e3f442fe2986b2265baf6972112db858db2588c (diff) | |
| parent | 754760fdbe9ec0f1d5c2864f6621b2213155f8c7 (diff) | |
| download | nextcloud-server-fdf10e242d39d0bc4b4b7fef8ead5589c549763d.tar.gz nextcloud-server-fdf10e242d39d0bc4b4b7fef8ead5589c549763d.zip | |
Merge pull request #2850 from nextcloud/downstream-26603
Fixed size issues on main detail view and disappearing of share recipients (#26603)
Diffstat (limited to 'apps/dav')
| -rw-r--r-- | apps/dav/lib/Connector/Sabre/FilesPlugin.php | 3 | ||||
| -rw-r--r-- | apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/apps/dav/lib/Connector/Sabre/FilesPlugin.php b/apps/dav/lib/Connector/Sabre/FilesPlugin.php index 54d91db5c06..5e401b88481 100644 --- a/apps/dav/lib/Connector/Sabre/FilesPlugin.php +++ b/apps/dav/lib/Connector/Sabre/FilesPlugin.php @@ -328,6 +328,9 @@ class FilesPlugin extends ServerPlugin { $propFind->handle(self::HAS_PREVIEW_PROPERTYNAME, function () use ($node) { return json_encode($this->previewManager->isAvailable($node->getFileInfo())); }); + $propFind->handle(self::SIZE_PROPERTYNAME, function() use ($node) { + return $node->getSize(); + }); } if ($node instanceof \OCA\DAV\Connector\Sabre\Node) { diff --git a/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php index c6e833033d5..1c9ebdd09b6 100644 --- a/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php @@ -188,8 +188,6 @@ class FilesPluginTest extends TestCase { $node->expects($this->exactly(2)) ->method('getOwner') ->will($this->returnValue($user)); - $node->expects($this->never()) - ->method('getSize'); $this->plugin->handleGetProperties( $propFind, |