summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing/application.php
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2015-01-20 00:35:47 +0100
committerBjoern Schiessle <schiessle@owncloud.com>2015-01-26 16:54:50 +0100
commit66f0db30b2ba97cbe91031b42740dabddc659f0d (patch)
tree87a3581924531ecb6ba40f7eee1ba6bf35c4ec81 /apps/files_sharing/application.php
parent836b80919feb3e32ab54d605385c32a5da053cdc (diff)
downloadnextcloud-server-66f0db30b2ba97cbe91031b42740dabddc659f0d.tar.gz
nextcloud-server-66f0db30b2ba97cbe91031b42740dabddc659f0d.zip
use uid provided by setupfs hook to mount server2server shares, otherwise mount will fail for public link shares
Diffstat (limited to 'apps/files_sharing/application.php')
-rw-r--r--apps/files_sharing/application.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/files_sharing/application.php b/apps/files_sharing/application.php
index 56ec448d6a9..3302848106f 100644
--- a/apps/files_sharing/application.php
+++ b/apps/files_sharing/application.php
@@ -69,12 +69,14 @@ class Application extends App {
return Helper::isIncomingServer2serverShareEnabled();
});
$container->registerService('ExternalManager', function(SimpleContainer $c) use ($server){
+ $user = $server->getUserSession()->getUser();
+ $uid = $user ? $user->getUID() : null;
return new \OCA\Files_Sharing\External\Manager(
$server->getDatabaseConnection(),
\OC\Files\Filesystem::getMountManager(),
\OC\Files\Filesystem::getLoader(),
- $server->getUserSession(),
- $server->getHTTPHelper()
+ $server->getHTTPHelper(),
+ $uid
);
});