[Pkg-owncloud-commits] [owncloud] 133/273: no longer check if the external storage app is enabled, we use no the webdav implementation from core

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 372d58544f0217a5dced38bc5f28702d9a794938
Author: Bjoern Schiessle <schiessle at owncloud.com>
Date:   Mon Jun 30 12:34:49 2014 +0200

    no longer check if the external storage app is enabled, we use no the webdav implementation from core
---
 apps/files_sharing/ajax/external.php        | 5 +----
 apps/files_sharing/lib/external/manager.php | 5 ++---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/apps/files_sharing/ajax/external.php b/apps/files_sharing/ajax/external.php
index 52c84b7..0dbd3ab 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 4441a72..54fa86d 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;
 		}
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git