diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-07-11 18:03:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-11 18:03:06 +0200 |
| commit | 9e2d1caba2d9043c9ae0b6854878f4a94d05ee4b (patch) | |
| tree | b1ef96a3f27593af27125c6976afdad5c1408727 /lib | |
| parent | 4153e1de795d0977756583e5845f849662ed6528 (diff) | |
| parent | 6e7be6acfdf998eff0b229626dc533572318df80 (diff) | |
| download | nextcloud-server-9e2d1caba2d9043c9ae0b6854878f4a94d05ee4b.tar.gz nextcloud-server-9e2d1caba2d9043c9ae0b6854878f4a94d05ee4b.zip | |
Merge pull request #5681 from nextcloud/upstream-fix-circles
upstream fix circles
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Share20/Manager.php | 2 | ||||
| -rw-r--r-- | lib/private/Share20/ProviderFactory.php | 16 |
2 files changed, 12 insertions, 6 deletions
diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php index 7c39733ce2a..798ea937038 100644 --- a/lib/private/Share20/Manager.php +++ b/lib/private/Share20/Manager.php @@ -193,7 +193,7 @@ class Manager implements IManager { throw new \InvalidArgumentException('SharedWith should not be empty'); } } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_CIRCLE) { - $circle = \OCA\Circles\Api\Circles::detailsCircle($share->getSharedWith()); + $circle = \OCA\Circles\Api\v1\Circles::detailsCircle($share->getSharedWith()); if ($circle === null) { throw new \InvalidArgumentException('SharedWith is not a valid circle'); } diff --git a/lib/private/Share20/ProviderFactory.php b/lib/private/Share20/ProviderFactory.php index ddd8177250b..aedad6a32a7 100644 --- a/lib/private/Share20/ProviderFactory.php +++ b/lib/private/Share20/ProviderFactory.php @@ -51,9 +51,10 @@ class ProviderFactory implements IProviderFactory { private $federatedProvider = null; /** @var ShareByMailProvider */ private $shareByMailProvider; - /** @var \OCA\Circles\ShareByCircleProvider; - * ShareByCircleProvider */ - private $shareByCircleProvider; + /** @var \OCA\Circles\ShareByCircleProvider */ + private $shareByCircleProvider = null; + /** @var bool */ + private $circlesAreNotAvailable = false; /** * IProviderFactory constructor. @@ -179,11 +180,16 @@ class ProviderFactory implements IProviderFactory { */ protected function getShareByCircleProvider() { - $appManager = $this->serverContainer->getAppManager(); - if (!$appManager->isEnabledForUser('circles')) { + if ($this->circlesAreNotAvailable) { return null; } + if (!$this->serverContainer->getAppManager()->isEnabledForUser('circles') || + !class_exists('\OCA\Circles\ShareByCircleProvider') + ) { + $this->circlesAreNotAvailable = true; + return null; + } if ($this->shareByCircleProvider === null) { |