diff options
| author | Robin Appelman <robin@icewind.nl> | 2018-08-16 20:18:13 +0200 |
|---|---|---|
| committer | Robin Appelman <robin@icewind.nl> | 2018-08-16 21:27:51 +0200 |
| commit | b5217b6f6376f1a4384b9265d36c6d9348f84c68 (patch) | |
| tree | 064ce1c4f3e21a34d76c9746c41b910f8277e59d /apps/files_sharing | |
| parent | b79f338e71c37689e39c95633a92e1ed8ed79db7 (diff) | |
| download | nextcloud-server-b5217b6f6376f1a4384b9265d36c6d9348f84c68.tar.gz nextcloud-server-b5217b6f6376f1a4384b9265d36c6d9348f84c68.zip | |
don't check if target dir exists when using the default share target directory
Signed-off-by: Robin Appelman <robin@icewind.nl>
Diffstat (limited to 'apps/files_sharing')
| -rw-r--r-- | apps/files_sharing/lib/Helper.php | 4 | ||||
| -rw-r--r-- | apps/files_sharing/lib/SharedMount.php | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/apps/files_sharing/lib/Helper.php b/apps/files_sharing/lib/Helper.php index 72dea4b7dcb..5f29a7a2457 100644 --- a/apps/files_sharing/lib/Helper.php +++ b/apps/files_sharing/lib/Helper.php @@ -65,6 +65,10 @@ class Helper { return $path; } + public static function isUsingShareFolder() { + return \OC::$server->getConfig()->getSystemValue('share_folder', '/') !== '/'; + } + /** * get default share folder * diff --git a/apps/files_sharing/lib/SharedMount.php b/apps/files_sharing/lib/SharedMount.php index 37aa7220620..223d7693671 100644 --- a/apps/files_sharing/lib/SharedMount.php +++ b/apps/files_sharing/lib/SharedMount.php @@ -89,7 +89,7 @@ class SharedMount extends MountPoint implements MoveableMount { $mountPoint = basename($share->getTarget()); $parent = dirname($share->getTarget()); - if (!$this->recipientView->is_dir($parent)) { + if (Helper::isUsingShareFolder() && !$this->recipientView->is_dir($parent)) { $parent = Helper::getShareFolder($this->recipientView); } |