diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2020-11-30 09:53:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-30 09:53:53 +0100 |
| commit | 528516b69f8e8feaae88b033422947101f0369f5 (patch) | |
| tree | c49225e85ccd74cfca4a6eb9af997bc916f397cf /apps/dav/lib | |
| parent | 9409968451be5e25e271ea282863cea7818bed98 (diff) | |
| parent | 35098a99738b2149c65318b39400d6dafa6541c1 (diff) | |
| download | nextcloud-server-528516b69f8e8feaae88b033422947101f0369f5.tar.gz nextcloud-server-528516b69f8e8feaae88b033422947101f0369f5.zip | |
Merge pull request #23652 from nextcloud/bug/circles-508/circles-public-shares
Fix public calendars shared to circles
Diffstat (limited to 'apps/dav/lib')
| -rw-r--r-- | apps/dav/lib/Connector/Sabre/Principal.php | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/apps/dav/lib/Connector/Sabre/Principal.php b/apps/dav/lib/Connector/Sabre/Principal.php index 1ddbc1a6083..5dedb0a7d7b 100644 --- a/apps/dav/lib/Connector/Sabre/Principal.php +++ b/apps/dav/lib/Connector/Sabre/Principal.php @@ -178,10 +178,8 @@ class Principal implements BackendInterface { return $this->userToPrincipal($user); } } elseif ($prefix === 'principals/circles') { - try { + if ($this->userSession->getUser() !== null) { return $this->circleToPrincipal($name); - } catch (QueryException $e) { - return null; } } return null; @@ -471,9 +469,6 @@ class Principal implements BackendInterface { /** * @param string $circleUniqueId * @return array|null - * @throws \OCP\AppFramework\QueryException - * @suppress PhanUndeclaredClassMethod - * @suppress PhanUndeclaredClassCatch */ protected function circleToPrincipal($circleUniqueId) { if (!$this->appManager->isEnabledForUser('circles') || !class_exists('\OCA\Circles\Api\v1\Circles')) { |