sh

Signed-off-by: Robin Appelman <robin@icewind.nl>

apps/dav/lib/Connector/Sabre/SharesPlugin.php

@@ -201,18 +201,7 @@ class SharesPlugin extends \Sabre\DAV\ServerPlugin {
 				!is_null($propFind->getStatus(self::SHAREES_PROPERTYNAME))
 			)
 		) {
-			try {
-				$folderNode = $sabreNode->getNode();
-			} catch (NotFoundException $e) {
-				// If the folder can't be properly found just return
-				return;
-			}
-
-			if (!($folderNode instanceof Folder)) {
-				// Safety check
-				return;
-			}
-
+			$folderNode = $sabreNode->getNode();
 			$this->cachedFolders[] = $sabreNode->getPath();
 			$childShares = $this->getSharesFolder($folderNode);
 			foreach ($childShares as $id => $shares) {

lib/private/Files/View.php

@@ -1449,21 +1449,21 @@ class View {
 		$cache = $storage->getCache($internalPath);
 		$user = \OC_User::getUser();
 
-			if (!$directoryInfo) {
-				$data = $this->getCacheEntry($storage, $internalPath, $directory);
-				if (!$data instanceof ICacheEntry || !isset($data['fileid'])) {
-					return [];
-				}
-			} else {
-				$data = $directoryInfo;
-			}
-
-			if (!($data->getPermissions() & Constants::PERMISSION_READ)) {
+		if (!$directoryInfo) {
+			$data = $this->getCacheEntry($storage, $internalPath, $directory);
+			if (!$data instanceof ICacheEntry || !isset($data['fileid'])) {
 				return [];
 			}
+		} else {
+			$data = $directoryInfo;
+		}
+
+		if (!($data->getPermissions() & Constants::PERMISSION_READ)) {
+			return [];
+		}
 
-			$folderId = $data->getId();
-			$contents = $cache->getFolderContentsById($folderId); //TODO: mimetype_filter
+		$folderId = $data->getId();
+		$contents = $cache->getFolderContentsById($folderId); //TODO: mimetype_filter
 
 		$sharingDisabled = \OCP\Util::isSharingDisabledForUser();