Merge pull request #1525 from nextcloud/bugfix/sentry
Fix undefined users variable
This commit is contained in:
@@ -234,11 +234,11 @@ class PermissionService {
|
|||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$users = [];
|
||||||
$owner = $this->userManager->get($board->getOwner());
|
$owner = $this->userManager->get($board->getOwner());
|
||||||
if ($owner === null) {
|
if ($owner === null) {
|
||||||
$this->logger->info('No owner found for board ' . $board->getId());
|
$this->logger->info('No owner found for board ' . $board->getId());
|
||||||
} else {
|
} else {
|
||||||
$users = [];
|
|
||||||
$users[$owner->getUID()] = new User($owner);
|
$users[$owner->getUID()] = new User($owner);
|
||||||
}
|
}
|
||||||
$acls = $this->aclMapper->findAll($boardId);
|
$acls = $this->aclMapper->findAll($boardId);
|
||||||
@@ -270,7 +270,7 @@ class PermissionService {
|
|||||||
$this->logger->info('No circle found for acl rule ' . $acl->getId());
|
$this->logger->info('No circle found for acl rule ' . $acl->getId());
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach ($circle->getMembers() as $member) {
|
foreach ($circle->getMembers() as $member) {
|
||||||
$user = $this->userManager->get($member->getUserId());
|
$user = $this->userManager->get($member->getUserId());
|
||||||
if ($user === null) {
|
if ($user === null) {
|
||||||
@@ -278,7 +278,7 @@ class PermissionService {
|
|||||||
} else {
|
} else {
|
||||||
$users[$member->getUserId()] = new User($user);
|
$users[$member->getUserId()] = new User($user);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
$this->logger->info('Member not found in circle that was accessed. This should not happen.');
|
$this->logger->info('Member not found in circle that was accessed. This should not happen.');
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user