Merge pull request #6894 from nextcloud/backport/6893/stable31

Author: juliusknorr

lib/Sharing/DeckShareProvider.php

@@ -270,15 +270,15 @@ private function createShareObject(array $data): IShare {
 
 	private function applyBoardPermission($share, $permissions, $userId) {
 		try {
-			$this->permissionService->checkPermission($this->cardMapper, $share->getSharedWith(), Acl::PERMISSION_EDIT, $userId);
+			$this->permissionService->checkPermission($this->cardMapper, $share->getSharedWith(), Acl::PERMISSION_EDIT, $userId, true);
 		} catch (NoPermissionException $e) {
 			$permissions &= Constants::PERMISSION_ALL - Constants::PERMISSION_UPDATE;
 			$permissions &= Constants::PERMISSION_ALL - Constants::PERMISSION_CREATE;
 			$permissions &= Constants::PERMISSION_ALL - Constants::PERMISSION_DELETE;
 		}
 
 		try {
-			$this->permissionService->checkPermission($this->cardMapper, $share->getSharedWith(), Acl::PERMISSION_SHARE, $userId);
+			$this->permissionService->checkPermission($this->cardMapper, $share->getSharedWith(), Acl::PERMISSION_SHARE, $userId, true);
 		} catch (NoPermissionException $e) {
 			$permissions &= Constants::PERMISSION_ALL - Constants::PERMISSION_SHARE;
 		}
@@ -747,6 +747,8 @@ public function getSharedWith($userId, $shareType, $node, $limit, $offset): arra
 					$qb->expr()->eq('s.item_type', $qb->createNamedParameter('folder'))
 				));
 
+			$qb->andWhere($qb->expr()->eq('dc.deleted_at', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)));
+
 			$cursor = $qb->execute();
 			while ($data = $cursor->fetch()) {
 				if (!$this->isAccessibleResult($data)) {