Merge pull request #24446 from nextcloud/backport/23652/stable20

[stable20] Fix public calendars shared to circles
nextcloud · Nov 30, 2020 · 6916240 · 6916240
2 parents b1f3f5d + 6635dbb
commit 6916240
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/apps/dav/lib/Connector/Sabre/Principal.php b/apps/dav/lib/Connector/Sabre/Principal.php
@@ -178,10 +178,8 @@ public function getPrincipalByPath($path) {
 				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 @@ public function getPrincipalPrefix() {
 	/**
 	 * @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')) {