diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-06 15:23:27 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-06 15:23:27 +0200 |
| commit | 932e64f77fd8de4380d6f2229390d82df5765eb6 (patch) | |
| tree | 166eb07844abd578215bc1f4189d8f241de1ff90 /settings | |
| parent | 79524ce163985c0ecfd22715080fc6fd12aeaf06 (diff) | |
| parent | 6c798889a5a9384371aa780c1b399e087543fd4a (diff) | |
| download | nextcloud-server-932e64f77fd8de4380d6f2229390d82df5765eb6.tar.gz nextcloud-server-932e64f77fd8de4380d6f2229390d82df5765eb6.zip | |
Merge pull request #19602 from owncloud/allow-certificate-import
Fix importing of certificates
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/controller/certificatecontroller.php | 5 | ||||
| -rw-r--r-- | settings/personal.php | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/settings/controller/certificatecontroller.php b/settings/controller/certificatecontroller.php index 2995c7f38bf..8ff9f51a66c 100644 --- a/settings/controller/certificatecontroller.php +++ b/settings/controller/certificatecontroller.php @@ -122,8 +122,9 @@ class CertificateController extends Controller { protected function isCertificateImportAllowed() { $externalStorageEnabled = $this->appManager->isEnabledForUser('files_external'); if ($externalStorageEnabled) { - $backendService = \OC_Mount_Config::$app->getContainer()->query('OCA\Files_External\Service\BackendService'); - if ($backendService->getBackendsVisibleFor(\OCA\Files_External\Service\BackendService::VISIBILITY_PERSONAL)) { + /** @var \OCA\Files_External\Service\BackendService $backendService */ + $backendService = \OC_Mount_Config::$app->getContainer()->query('\OCA\Files_External\Service\BackendService'); + if ($backendService->isUserMountingAllowed()) { return true; } } diff --git a/settings/personal.php b/settings/personal.php index e9e2046f00a..e58e043af50 100644 --- a/settings/personal.php +++ b/settings/personal.php @@ -119,7 +119,9 @@ $clients = array( $enableCertImport = false; $externalStorageEnabled = \OC::$server->getAppManager()->isEnabledForUser('files_external'); if ($externalStorageEnabled) { - $enableCertImport = true; + /** @var \OCA\Files_External\Service\BackendService $backendService */ + $backendService = \OC_Mount_Config::$app->getContainer()->query('\OCA\Files_External\Service\BackendService'); + $enableCertImport = $backendService->isUserMountingAllowed(); } |