]> source.dussan.org Git - nextcloud-server.git/commitdiff
Use the share_folder config for remote shares 5458/head
authorJoas Schilling <coding@schilljs.com>
Tue, 13 Jun 2017 12:30:25 +0000 (14:30 +0200)
committerJoas Schilling <coding@schilljs.com>
Mon, 19 Jun 2017 08:21:56 +0000 (10:21 +0200)
Signed-off-by: Joas Schilling <coding@schilljs.com>
apps/files_sharing/lib/External/Manager.php

index 4e0b3a215f0bd12761729b97f3704707efd6b22f..54d0f9bd0c30a0a1496ba374033baf5917888754 100644 (file)
@@ -30,6 +30,7 @@
 namespace OCA\Files_Sharing\External;
 
 use OC\Files\Filesystem;
+use OCA\Files_Sharing\Helper;
 use OCP\Files;
 use OCP\Files\Storage\IStorageFactory;
 use OCP\Http\Client\IClientService;
@@ -199,8 +200,9 @@ class Manager {
 
                if ($share) {
                        \OC_Util::setupFS($this->uid);
-                       $mountPoint = Files::buildNotExistingFileName('/', $share['name']);
-                       $mountPoint = Filesystem::normalizePath('/' . $mountPoint);
+                       $shareFolder = Helper::getShareFolder();
+                       $mountPoint = Files::buildNotExistingFileName($shareFolder, $share['name']);
+                       $mountPoint = Filesystem::normalizePath($mountPoint);
                        $hash = md5($mountPoint);
 
                        $acceptShare = $this->connection->prepare('