summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2015-04-15 18:18:28 +0200
committerRobin Appelman <icewind@owncloud.com>2015-04-27 14:07:16 +0200
commit8cb40f6043c9eb7d2285954a404bd52162851beb (patch)
treee05e417eb497b2217b40b7caaf92106f1ba7607c
parentd5434c9c4e005ff0407d6adddbc2a81dbedd7783 (diff)
downloadnextcloud-server-8cb40f6043c9eb7d2285954a404bd52162851beb.tar.gz
nextcloud-server-8cb40f6043c9eb7d2285954a404bd52162851beb.zip
Make sure the owner mountpoints are setup
-rw-r--r--apps/files_sharing/lib/mountprovider.php2
-rw-r--r--apps/files_sharing/lib/sharedmount.php4
2 files changed, 5 insertions, 1 deletions
diff --git a/apps/files_sharing/lib/mountprovider.php b/apps/files_sharing/lib/mountprovider.php
index 0ba44ec7a95..9f18ef737b3 100644
--- a/apps/files_sharing/lib/mountprovider.php
+++ b/apps/files_sharing/lib/mountprovider.php
@@ -8,6 +8,7 @@
namespace OCA\Files_Sharing;
+use OC\Files\Filesystem;
use OCA\Files_Sharing\Propagation\PropagationManager;
use OCP\Files\Config\IMountProvider;
use OCP\Files\Storage\IStorageFactory;
@@ -50,6 +51,7 @@ class MountProvider implements IMountProvider {
return $share['permissions'] > 0;
});
return array_map(function ($share) use ($user, $storageFactory) {
+ Filesystem::initMountPoints($share['uid_owner']);
// for updating etags for the share owner when we make changes to this share.
$ownerPropagator = $this->propagationManager->getChangePropagator($share['uid_owner']);
diff --git a/apps/files_sharing/lib/sharedmount.php b/apps/files_sharing/lib/sharedmount.php
index fbf8d05c1b2..8c473e1f1c2 100644
--- a/apps/files_sharing/lib/sharedmount.php
+++ b/apps/files_sharing/lib/sharedmount.php
@@ -25,6 +25,7 @@ namespace OCA\Files_Sharing;
use OC\Files\Mount\MountPoint;
use OC\Files\Mount\MoveableMount;
+use OC\Files\View;
/**
* Shared mount points can be moved by the user
@@ -55,8 +56,9 @@ class SharedMount extends MountPoint implements MoveableMount {
$mountPoint = basename($share['file_target']);
$parent = dirname($share['file_target']);
+ $view = new View('/' . $user . '/files');
- if (!\OC\Files\Filesystem::is_dir($parent)) {
+ if (!$view->is_dir($parent)) {
$parent = Helper::getShareFolder();
}