mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5484 from nextcloud/fix-if-circles-is-deleted 

Check if Circles is still here
This commit is contained in:
Morris Jobke 2017-07-11 23:42:30 +02:00 committed by GitHub
parent ce59546344 02baa45898
commit 48351b4778
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files_sharing/lib/Controller/ShareAPIController.php
View File

@ -450,7 +450,7 @@ class ShareAPIController extends OCSController {
} }
$share->setSharedWith($shareWith); $share->setSharedWith($shareWith);
} else if ($shareType === \OCP\Share::SHARE_TYPE_CIRCLE) { } else if ($shareType === \OCP\Share::SHARE_TYPE_CIRCLE) {
if (!\OCP\App::isEnabled('circles')) { if (!\OC::$server->getAppManager()->isEnabledForUser('circles') || !class_exists('\OCA\Circles\ShareByCircleProvider')) {
throw new OCSNotFoundException($this->l->t('You cannot share to a Circle if the app is not enabled')); throw new OCSNotFoundException($this->l->t('You cannot share to a Circle if the app is not enabled'));
} }

2
apps/files_sharing/lib/Controller/ShareesAPIController.php
View File

@ -472,7 +472,7 @@ class ShareesAPIController extends OCSController {
$shareTypes[] = Share::SHARE_TYPE_EMAIL; $shareTypes[] = Share::SHARE_TYPE_EMAIL;
} }
if (\OCP\App::isEnabled('circles')) { if (\OC::$server->getAppManager()->isEnabledForUser('circles') && class_exists('\OCA\Circles\ShareByCircleProvider')) {
$shareTypes[] = Share::SHARE_TYPE_CIRCLE; $shareTypes[] = Share::SHARE_TYPE_CIRCLE;
} }

16
lib/private/Share20/ProviderFactory.php
View File

@ -51,9 +51,10 @@ class ProviderFactory implements IProviderFactory {
private $federatedProvider = null; private $federatedProvider = null;
/** @var ShareByMailProvider */ /** @var ShareByMailProvider */
private $shareByMailProvider; private $shareByMailProvider;
/** @var \OCA\Circles\ShareByCircleProvider; /** @var \OCA\Circles\ShareByCircleProvider */
* ShareByCircleProvider */ private $shareByCircleProvider = null;
private $shareByCircleProvider; /** @var bool */
private $circlesAreNotAvailable = false;
/** /**
* IProviderFactory constructor. * IProviderFactory constructor.
@ -179,11 +180,16 @@ class ProviderFactory implements IProviderFactory {
*/ */
protected function getShareByCircleProvider() { protected function getShareByCircleProvider() {
$appManager = $this->serverContainer->getAppManager(); if ($this->circlesAreNotAvailable) {
if (!$appManager->isEnabledForUser('circles')) {
return null; return null;
} }
if (!$this->serverContainer->getAppManager()->isEnabledForUser('circles') ||
!class_exists('\OCA\Circles\ShareByCircleProvider')
) {
$this->circlesAreNotAvailable = true;
return null;
}
if ($this->shareByCircleProvider === null) { if ($this->shareByCircleProvider === null) {