Skip to content

[stable19] Fix public calendars shared to circles #24447

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 2 commits into from
Nov 30, 2020
Merged

[stable19] Fix public calendars shared to circles #24447

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0436416
Update phpdoc for circleToPrincipal
kesselb Oct 23, 2020
23263f9
A valid user session is required for circles.
kesselb Oct 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Update phpdoc for circleToPrincipal 
as the QueryException is already catched inside circleToPrincipal.

Signed-off-by: Daniel Kesselberg <[email protected]>
  • Loading branch information
@kesselb @backportbot
kesselb authored and backportbot[bot] committed Nov 30, 2020
commit 04364169eda81b1fbc1e303f0cc7326b866cc167
9 changes: 1 addition & 8 deletions apps/dav/lib/Connector/Sabre/Principal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,11 +178,7 @@ public function getPrincipalByPath($path) {
return $this->userToPrincipal($user);
}
} elseif ($prefix === 'principals/circles') {
try {
return $this->circleToPrincipal($name);
} catch (QueryException $e) {
return null;
}
return $this->circleToPrincipal($name);
}
return null;
}
Expand Down Expand Up @@ -471,9 +467,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')) {
Expand Down