diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-06-14 22:42:06 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-14 22:42:06 -0500 |
| commit | db14089d6c92f750b66d57c127b521c0acf01943 (patch) | |
| tree | fefeb29b0bac77b4151068821b1be6e758ea6904 /apps/files_sharing | |
| parent | 7a269ae872551c2205a9a25c2c233aa59e3429bf (diff) | |
| parent | b5beaf7ef4681188680ccc2612237291b51d3a3f (diff) | |
| download | nextcloud-server-db14089d6c92f750b66d57c127b521c0acf01943.tar.gz nextcloud-server-db14089d6c92f750b66d57c127b521c0acf01943.zip | |
Merge pull request #5375 from nextcloud/share-folder-for-remote-shares
Use the share_folder config for remote shares
Diffstat (limited to 'apps/files_sharing')
| -rw-r--r-- | apps/files_sharing/lib/External/Manager.php | 6 |
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(' |