summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Appelman <robin@icewind.nl>2021-01-26 16:07:26 +0100
committerbackportbot[bot] <backportbot[bot]@users.noreply.github.com>2021-03-15 17:51:34 +0000
commite5ffb96c36f89113fcca8e0f5bdfdb98040186b6 (patch)
treef6be87c350fcf58d1a0e41f7cea26683fa86b83d
parentc7278790738c346e25f4ad201806e4a7a9e81363 (diff)
downloadnextcloud-server-e5ffb96c36f89113fcca8e0f5bdfdb98040186b6.tar.gz
nextcloud-server-e5ffb96c36f89113fcca8e0f5bdfdb98040186b6.zip
only use share cacheentry when available
Signed-off-by: Robin Appelman <robin@icewind.nl>
-rw-r--r--lib/private/Share20/Share.php10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/private/Share20/Share.php b/lib/private/Share20/Share.php
index a4fbf051413..87f77701ee2 100644
--- a/lib/private/Share20/Share.php
+++ b/lib/private/Share20/Share.php
@@ -30,6 +30,7 @@
namespace OC\Share20;
+use OCP\Files\File;
use OCP\Files\Cache\ICacheEntry;
use OCP\Files\FileInfo;
use OCP\Files\IRootFolder;
@@ -233,8 +234,13 @@ class Share implements \OCP\Share\IShare {
*/
public function getNodeType() {
if ($this->nodeType === null) {
- $info = $this->getNodeCacheEntry();
- $this->nodeType = $info->getMimeType() === FileInfo::MIMETYPE_FOLDER ? 'folder' : 'file';
+ if ($this->getNodeCacheEntry()) {
+ $info = $this->getNodeCacheEntry();
+ $this->nodeType = $info->getMimeType() === FileInfo::MIMETYPE_FOLDER ? 'folder' : 'file';
+ } else {
+ $node = $this->getNode();
+ $this->nodeType = $node instanceof File ? 'file' : 'folder';
+ }
}
return $this->nodeType;