diff options
| -rw-r--r-- | apps/files_sharing/ajax/external.php | 5 | ||||
| -rw-r--r-- | apps/files_sharing/js/share.js | 2 | ||||
| -rw-r--r-- | apps/files_sharing/lib/external/manager.php | 5 |
3 files changed, 4 insertions, 8 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/js/share.js b/apps/files_sharing/js/share.js index 0999bfd6bed..2efed5310bc 100644 --- a/apps/files_sharing/js/share.js +++ b/apps/files_sharing/js/share.js @@ -107,7 +107,7 @@ var appendTo = $tr.find('td.filename'); // Check if drop down is already visible for a different file if (OC.Share.droppedDown) { - if ($tr.data('id') !== $('#dropdown').attr('data-item-source')) { + if ($tr.attr('data-id') !== $('#dropdown').attr('data-item-source')) { OC.Share.hideDropDown(function () { $tr.addClass('mouseOver'); OC.Share.showDropDown(itemType, $tr.data('id'), appendTo, true, possiblePermissions, filename); 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; } |