mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

no longer check if the external storage app is enabled, we use no the webdav implementation from core

This commit is contained in:
Bjoern Schiessle 2014-06-30 12:34:49 +02:00
parent d94d307f52
commit 372d58544f
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/files_sharing/ajax/external.php
View File

@ -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();
}

5
apps/files_sharing/lib/external/manager.php vendored
View File

@ -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;
}