summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2014-06-30 12:34:49 +0200
committerBjoern Schiessle <schiessle@owncloud.com>2014-06-30 12:34:49 +0200
commit372d58544f0217a5dced38bc5f28702d9a794938 (patch)
tree9689463ab7bd4cb1630d3d50655162a4a585dd64
parentd94d307f522ce724ac288f57f563338f7229db4c (diff)
downloadnextcloud-server-372d58544f0217a5dced38bc5f28702d9a794938.tar.gz
nextcloud-server-372d58544f0217a5dced38bc5f28702d9a794938.zip
no longer check if the external storage app is enabled, we use no the webdav implementation from core
-rw-r--r--apps/files_sharing/ajax/external.php5
-rw-r--r--apps/files_sharing/lib/external/manager.php5
2 files changed, 3 insertions, 7 deletions
diff --git a/apps/files_sharing/ajax/external.php b/apps/files_sharing/ajax/external.php
index 52c84b7babb..0dbd3ab8c95 100644
--- a/apps/files_sharing/ajax/external.php
+++ b/apps/files_sharing/ajax/external.php
@@ -13,10 +13,7 @@ OCP\JSON::checkAppEnabled('files_sharing');
$l = OC_L10N::get('files_sharing');
// check if server admin allows to mount public links from other servers
-// check if files_external is enabled
-// FIXME file_external check no longer needed if we use the webdav implementation from core
-if (OCA\Files_Sharing\Helper::isIncomingServer2serverShareEnabled() === false ||
- \OC_App::isEnabled('files_external') === false) {
+if (OCA\Files_Sharing\Helper::isIncomingServer2serverShareEnabled() === false) {
\OCP\JSON::error(array('data' => array('message' => $l->t('Server to server sharing is not enabled on this server'))));
exit();
}
diff --git a/apps/files_sharing/lib/external/manager.php b/apps/files_sharing/lib/external/manager.php
index 4441a72fb16..54fa86db762 100644
--- a/apps/files_sharing/lib/external/manager.php
+++ b/apps/files_sharing/lib/external/manager.php
@@ -68,9 +68,8 @@ class Manager {
}
private function setupMounts() {
- // don't setup server-to-server shares if the file_external app is disabled
- // FIXME no longer needed if we use the webdav implementation from core
- if (\OC_App::isEnabled('files_external') === false) {
+ // don't setup server-to-server shares if the admin disabled it
+ if (\OCA\Files_Sharing\Helper::isIncomingServer2serverShareEnabled() === false) {
return false;
}