diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2016-04-18 18:17:08 +0200 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2016-04-22 14:55:40 +0200 |
| commit | e10105474fbef8940fdfa96d5e2bf2f09b1f0649 (patch) | |
| tree | 1881e059a3408a2d4e8096e31719ba989f7dfab1 /apps/files_sharing/appinfo | |
| parent | 606b756a94643eaae87e18b39f6c75e6d18fec7e (diff) | |
| download | nextcloud-server-e10105474fbef8940fdfa96d5e2bf2f09b1f0649.tar.gz nextcloud-server-e10105474fbef8940fdfa96d5e2bf2f09b1f0649.zip | |
move federated sharing settings to the federatedfilesharing app
Diffstat (limited to 'apps/files_sharing/appinfo')
| -rw-r--r-- | apps/files_sharing/appinfo/app.php | 3 | ||||
| -rw-r--r-- | apps/files_sharing/appinfo/application.php | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php index 29202c15b22..e0cbfd7f5ba 100644 --- a/apps/files_sharing/appinfo/app.php +++ b/apps/files_sharing/appinfo/app.php @@ -44,9 +44,6 @@ $l = \OC::$server->getL10N('files_sharing'); $application = new Application(); $application->registerMountProviders(); -\OCP\App::registerAdmin('files_sharing', 'settings-admin'); -\OCP\App::registerPersonal('files_sharing', 'settings-personal'); - \OCA\Files_Sharing\Helper::registerHooks(); \OCP\Share::registerBackend('file', 'OC_Share_Backend_File'); diff --git a/apps/files_sharing/appinfo/application.php b/apps/files_sharing/appinfo/application.php index 5233b343830..b17e213e2e2 100644 --- a/apps/files_sharing/appinfo/application.php +++ b/apps/files_sharing/appinfo/application.php @@ -45,6 +45,7 @@ class Application extends App { * Controllers */ $container->registerService('ShareController', function (SimpleContainer $c) use ($server) { + $federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application('federatedfilesharing'); return new ShareController( $c->query('AppName'), $c->query('Request'), @@ -56,7 +57,8 @@ class Application extends App { $server->getShareManager(), $server->getSession(), $server->getPreviewManager(), - $server->getRootFolder() + $server->getRootFolder(), + $federatedSharingApp->getFederatedShareProvider() ); }); $container->registerService('ExternalSharesController', function (SimpleContainer $c) { |