Skip to content

Commit da8abf1

Browse files
authored
Merge pull request #2283 from nextcloud/fix/allow_owner_leave
fix: allow owner to leave a circle
2 parents 7907667 + f5dc7c3 commit da8abf1

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

lib/FederatedItems/CircleLeave.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
use OCA\Circles\Model\Circle;
2727
use OCA\Circles\Model\Federated\FederatedEvent;
2828
use OCA\Circles\Model\FederatedUser;
29-
use OCA\Circles\Model\Helpers\MemberHelper;
3029
use OCA\Circles\Model\Member;
3130
use OCA\Circles\Model\Probes\CircleProbe;
3231
use OCA\Circles\Service\ConfigService;
@@ -103,10 +102,7 @@ public function verify(FederatedEvent $event): void {
103102
$circle = $event->getCircle();
104103
$member = $circle->getInitiator();
105104

106-
if (!$event->getParams()->gBool('force')) {
107-
$memberHelper = new MemberHelper($member);
108-
$memberHelper->cannotBeOwner();
109-
} elseif ($this->configService->isLocalInstance($event->getOrigin())) {
105+
if ($this->configService->isLocalInstance($event->getOrigin())) {
110106
if ($member->getLevel() === Member::LEVEL_OWNER) {
111107
try {
112108
$newOwner = $this->selectNewOwner($circle);

0 commit comments

Comments
 (0)