diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-12-02 10:56:59 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-12-02 10:56:59 +0100 |
| commit | d4abbb10d3b8b1b6685f239c8e6ec5e19d013680 (patch) | |
| tree | b197405ee4637fea8a4c1d1990497c8cd7540e4f /apps/files_sharing | |
| parent | 812a390f32a60746ba36c6cb28088aa47fed3b66 (diff) | |
| parent | 1e19661daa75a4032f8532e149e7540042d9b7a7 (diff) | |
| download | nextcloud-server-d4abbb10d3b8b1b6685f239c8e6ec5e19d013680.tar.gz nextcloud-server-d4abbb10d3b8b1b6685f239c8e6ec5e19d013680.zip | |
Merge pull request #20884 from owncloud/fix_20713
Respect disabled incoming federated shares
Diffstat (limited to 'apps/files_sharing')
| -rw-r--r-- | apps/files_sharing/appinfo/app.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php index 5f56340d254..d7f3ba6e98d 100644 --- a/apps/files_sharing/appinfo/app.php +++ b/apps/files_sharing/appinfo/app.php @@ -57,7 +57,9 @@ $eventDispatcher->addListener( function() { \OCP\Util::addScript('files_sharing', 'share'); \OCP\Util::addScript('files_sharing', 'sharetabview'); - \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'); + } \OCP\Util::addStyle('files_sharing', 'sharetabview'); } ); |