Skip to content

Commit 949cb99

Browse files
authored
Merge pull request #3625 from bink/bugfix/correct-acl-for-cirlce-and-member-shares
Fix: Check all circle shares for permissions
2 parents 5d477b7 + 04f8292 commit 949cb99

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

lib/Service/PermissionService.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,9 @@ public function userCan(array $acls, $permission, $userId = null) {
213213

214214
if ($this->circlesService->isCirclesEnabled() && $acl->getType() === Acl::PERMISSION_TYPE_CIRCLE) {
215215
try {
216-
return $this->circlesService->isUserInCircle($acl->getParticipant(), $userId) && $acl->getPermission($permission);
216+
if ($this->circlesService->isUserInCircle($acl->getParticipant(), $userId) && $acl->getPermission($permission)) {
217+
return true;
218+
}
217219
} catch (\Exception $e) {
218220
$this->logger->info('Member not found in circle that was accessed. This should not happen.');
219221
}

0 commit comments

Comments
 (0)