summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@owncloud.com>2015-12-02 09:00:21 +0100
committerRoeland Jago Douma <rullzer@owncloud.com>2015-12-18 09:17:54 +0100
commit5721038f4781ad606ea5f2943c85b5e015dc2bea (patch)
tree00910e3935f7a78de439f2d1c7b99010293b3d9e /apps/files_sharing
parent678ad217e2d311ddb324ab7721e1c990b3b28753 (diff)
downloadnextcloud-server-5721038f4781ad606ea5f2943c85b5e015dc2bea.tar.gz
nextcloud-server-5721038f4781ad606ea5f2943c85b5e015dc2bea.zip
[Sharing] Respect disabled incoming federated shares
Only fetch the incoming federated shares if incoming shares are actually enabled. Fixes #20713
Diffstat (limited to 'apps/files_sharing')
-rw-r--r--apps/files_sharing/appinfo/app.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index a5c2f3c6f8d..f281967aa7b 100644
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -52,7 +52,10 @@ $application->setupPropagation();
\OCP\Share::registerBackend('folder', 'OC_Share_Backend_Folder', 'file');
\OCP\Util::addScript('files_sharing', 'share');
-\OCP\Util::addScript('files_sharing', 'external');
+
+if (\OC::$server->getConfig()->getAppValue('files_sharing', 'incoming_server2server_share_enabled', 'yes') === 'yes') {
+ \OCP\Util::addScript('files_sharing', 'external');
+}
\OC::$server->getActivityManager()->registerExtension(function() {
return new \OCA\Files_Sharing\Activity(