diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2022-08-30 17:41:58 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-30 17:41:58 +0300 |
| commit | 68081ac3190a8192539e9824214b86491ec5f971 (patch) | |
| tree | 518a4712a5347a530213d01d8e2959221e23628a /lib | |
| parent | 0371fc3d9ff5db59cc1b65a09e1e76c61a541aec (diff) | |
| parent | dfe7b6c729881d5c2b9e61ed967d6668a8b13612 (diff) | |
Merge pull request #7824 from nextcloud/bugfix/noid/fix-handling-of-guest-moderators
Make handling of guest moderators consistent on different endpoints f…
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Chat/ChatManager.php | 2 | ||||
| -rw-r--r-- | lib/Controller/PollController.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/Chat/ChatManager.php b/lib/Chat/ChatManager.php index 08359f004..d26cbeb40 100644 --- a/lib/Chat/ChatManager.php +++ b/lib/Chat/ChatManager.php @@ -343,7 +343,7 @@ class ChatManager { $attendee = $participant->getAttendee(); - if (!$participant->hasModeratorPermissions() && + if (!$participant->hasModeratorPermissions(false) && !($attendee->getActorType() === Attendee::ACTOR_USERS && $attendee->getActorId() === $share->getShareOwner())) { // Only moderators or the share owner can delete the share return; diff --git a/lib/Controller/PollController.php b/lib/Controller/PollController.php index 5b0c183dc..15d395bd7 100644 --- a/lib/Controller/PollController.php +++ b/lib/Controller/PollController.php @@ -252,7 +252,7 @@ class PollController extends AEnvironmentAwareController { if (!$canSeeSummary && $poll->getStatus() === Poll::STATUS_OPEN) { $data['votes'] = []; - if ($this->participant->hasModeratorPermissions(false) + if ($this->participant->hasModeratorPermissions() || ($poll->getActorType() === $this->participant->getAttendee()->getActorType() && $poll->getActorId() === $this->participant->getAttendee()->getActorId())) { // Allow moderators and the author to see the number of voters, |