summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorBjörn Schießle <bjoern@schiessle.org>2017-06-02 20:18:45 +0200
committerGitHub <noreply@github.com>2017-06-02 20:18:45 +0200
commit52f6c22954fc50d8f250a4d0bdc29a4ad3ae47f5 (patch)
treee4fd4e910a04cd6f1a8b6587d8fdefbf2dda065a /settings
parenta61aabea830f3b187fffe77e321747c871296e9c (diff)
parent6e7ff2447477b5750d3aca0dc6457a4e756cafd4 (diff)
downloadnextcloud-server-52f6c22954fc50d8f250a4d0bdc29a4ad3ae47f5.tar.gz
nextcloud-server-52f6c22954fc50d8f250a4d0bdc29a4ad3ae47f5.zip
Merge pull request #5224 from nextcloud/useful-gs-settings-stable12
[stable12] add new config switched for the global scale architecture
Diffstat (limited to 'settings')
-rw-r--r--settings/personal.php10
1 files changed, 8 insertions, 2 deletions
diff --git a/settings/personal.php b/settings/personal.php
index a9637011afa..a31ad9b8332 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -212,8 +212,14 @@ $tmpl->assign('certs', $certificateManager->listCertificates());
$tmpl->assign('showCertificates', $enableCertImport);
$tmpl->assign('urlGenerator', $urlGenerator);
-$lookupServerUploadEnabled = $config->getAppValue('files_sharing', 'lookupServerUploadEnabled', 'yes');
-$lookupServerUploadEnabled = $lookupServerUploadEnabled === 'yes';
+$federatedFileSharingEnabled = \OC::$server->getAppManager()->isEnabledForUser('federatedfilesharing');
+$lookupServerUploadEnabled = false;
+if ($federatedFileSharingEnabled) {
+ $federatedFileSharing = new \OCA\FederatedFileSharing\AppInfo\Application();
+ $shareProvider = $federatedFileSharing->getFederatedShareProvider();
+ $lookupServerUploadEnabled = $shareProvider->isLookupServerUploadEnabled();
+}
+
$tmpl->assign('lookupServerUploadEnabled', $lookupServerUploadEnabled);
// Get array of group ids for this user