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

Merge pull request #25161 from owncloud/fixgetsharefolder 

Make getShareFolder use given view instead of static FS
This commit is contained in:
Vincent Petry 2016-06-20 10:26:03 +02:00 committed by GitHub
parent e3ddbeb755 a636078e6c
commit fa533e72cd
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/files_sharing/lib/Helper.php
View File

@ -277,19 +277,23 @@ class Helper {
/**
* get default share folder
*
* @param \OC\Files\View
* @return string
*/
public static function getShareFolder() {
public static function getShareFolder($view = null) {
if ($view === null) {
$view = Filesystem::getView();
}
$shareFolder = \OC::$server->getConfig()->getSystemValue('share_folder', '/');
$shareFolder = Filesystem::normalizePath($shareFolder);
if (!Filesystem::file_exists($shareFolder)) {
if (!$view->file_exists($shareFolder)) {
$dir = '';
$subdirs = explode('/', $shareFolder);
foreach ($subdirs as $subdir) {
$dir = $dir . '/' . $subdir;
if (!Filesystem::is_dir($dir)) {
Filesystem::mkdir($dir);
if (!$view->is_dir($dir)) {
$view->mkdir($dir);
}
}
}

2
apps/files_sharing/lib/SharedMount.php
View File

@ -81,7 +81,7 @@ class SharedMount extends MountPoint implements MoveableMount {
$parent = dirname($share->getTarget());
if (!$this->recipientView->is_dir($parent)) {
$parent = Helper::getShareFolder();
$parent = Helper::getShareFolder($this->recipientView);
}
$newMountPoint = $this->generateUniqueTarget(