diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2021-05-31 13:03:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-31 13:03:07 +0200 |
| commit | 773e28d8e43b634fb641f71458abd8d21b5b6270 (patch) | |
| tree | 77e13d9b5adf187fef09a288abf25e8e03a2009c /apps | |
| parent | fd63132f474e58d643545cd83baf5cba27947586 (diff) | |
| parent | 11ad88e987c79bc36fa11002f94adb66fd9112de (diff) | |
| download | nextcloud-server-773e28d8e43b634fb641f71458abd8d21b5b6270.tar.gz nextcloud-server-773e28d8e43b634fb641f71458abd8d21b5b6270.zip | |
Merge pull request #27275 from nextcloud/bugfix/noid/circles-22-in-dav
Fixing invalid classes and methods for circles 22
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/dav/lib/Connector/Sabre/Principal.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/dav/lib/Connector/Sabre/Principal.php b/apps/dav/lib/Connector/Sabre/Principal.php index b74747b1163..1ebe853e465 100644 --- a/apps/dav/lib/Connector/Sabre/Principal.php +++ b/apps/dav/lib/Connector/Sabre/Principal.php @@ -37,7 +37,7 @@ namespace OCA\DAV\Connector\Sabre; use OC\KnownUser\KnownUserService; -use OCA\Circles\Exceptions\CircleDoesNotExistException; +use OCA\Circles\Exceptions\CircleNotFoundException; use OCA\DAV\CalDAV\Proxy\ProxyMapper; use OCA\DAV\Traits\PrincipalProxyTrait; use OCP\App\IAppManager; @@ -534,7 +534,7 @@ class Principal implements BackendInterface { $circle = \OCA\Circles\Api\v1\Circles::detailsCircle($circleUniqueId, true); } catch (QueryException $ex) { return null; - } catch (CircleDoesNotExistException $ex) { + } catch (CircleNotFoundException $ex) { return null; } @@ -544,7 +544,7 @@ class Principal implements BackendInterface { $principal = [ 'uri' => 'principals/circles/' . $circleUniqueId, - '{DAV:}displayname' => $circle->getName(), + '{DAV:}displayname' => $circle->getDisplayName(), ]; return $principal; @@ -575,7 +575,7 @@ class Principal implements BackendInterface { $circles = array_map(function ($circle) { /** @var \OCA\Circles\Model\Circle $circle */ - return 'principals/circles/' . urlencode($circle->getUniqueId()); + return 'principals/circles/' . urlencode($circle->getSingleId()); }, $circles); return $circles; |