summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2017-06-13 14:30:25 +0200
committerJoas Schilling <coding@schilljs.com>2017-06-13 14:30:25 +0200
commitb5beaf7ef4681188680ccc2612237291b51d3a3f (patch)
treec165d722974506888bf19bac5beb9ba11f5d30ec /apps
parentc46422b780621d5ac700e7ca2f6ddf7b1386482f (diff)
downloadnextcloud-server-b5beaf7ef4681188680ccc2612237291b51d3a3f.tar.gz
nextcloud-server-b5beaf7ef4681188680ccc2612237291b51d3a3f.zip
Use the share_folder config for remote shares
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'apps')
-rw-r--r--apps/files_sharing/lib/External/Manager.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/files_sharing/lib/External/Manager.php b/apps/files_sharing/lib/External/Manager.php
index 4e0b3a215f0..54d0f9bd0c3 100644
--- a/apps/files_sharing/lib/External/Manager.php
+++ b/apps/files_sharing/lib/External/Manager.php
@@ -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('