From e9c9754cec69a75206dcf8ff189241856518ef04 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 16 Aug 2018 20:18:13 +0200 Subject: [PATCH] don't check if target dir exists when using the default share target directory Signed-off-by: Robin Appelman --- apps/files_sharing/lib/Helper.php | 4 ++++ apps/files_sharing/lib/SharedMount.php | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/files_sharing/lib/Helper.php b/apps/files_sharing/lib/Helper.php index a659da9292f..2daff44f05a 100644 --- a/apps/files_sharing/lib/Helper.php +++ b/apps/files_sharing/lib/Helper.php @@ -237,6 +237,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 19325502d6f..0d0982c7566 100644 --- a/apps/files_sharing/lib/SharedMount.php +++ b/apps/files_sharing/lib/SharedMount.php @@ -88,7 +88,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); }