mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5375 from nextcloud/share-folder-for-remote-shares 

Use the share_folder config for remote shares
This commit is contained in:
Morris Jobke 2017-06-14 22:42:06 -05:00 committed by GitHub
parent 7a269ae872 b5beaf7ef4
commit db14089d6c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/files_sharing/lib/External/Manager.php vendored
View 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('