aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2014-05-27 22:43:20 +0200
committerRobin Appelman <icewind@owncloud.com>2014-06-06 09:56:00 +0200
commit0ce07bb6c4235d6fd735dbc870aad9ce7850736d (patch)
tree06987f78b1934d78a2be8c92a3577865e165f5d6 /apps
parent844b1e3fc6aae56926cac27b2402fa16cda2c60a (diff)
downloadnextcloud-server-0ce07bb6c4235d6fd735dbc870aad9ce7850736d.tar.gz
nextcloud-server-0ce07bb6c4235d6fd735dbc870aad9ce7850736d.zip
update mount point if file_target changed
Diffstat (limited to 'apps')
-rw-r--r--apps/files_sharing/lib/sharedmount.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/apps/files_sharing/lib/sharedmount.php b/apps/files_sharing/lib/sharedmount.php
index 0e2f19ef337..84eb4e78773 100644
--- a/apps/files_sharing/lib/sharedmount.php
+++ b/apps/files_sharing/lib/sharedmount.php
@@ -24,8 +24,9 @@ class SharedMount extends Mount implements MoveableMount {
public function __construct($storage, $mountpoint, $arguments = null, $loader = null) {
// first update the mount point before creating the parent
- self::verifyMountPoint($arguments['share']);
- parent::__construct($storage, $mountpoint, $arguments, $loader);
+ $newMountPoint = self::verifyMountPoint($arguments['share']);
+ $absMountPoint = '/' . \OCP\User::getUser() . '/files' . $newMountPoint;
+ parent::__construct($storage, $absMountPoint, $arguments, $loader);
}
/**
@@ -51,6 +52,8 @@ class SharedMount extends Mount implements MoveableMount {
$share['file_target'] = $newMountPoint;
$share['unique_name'] = true;
}
+
+ return $newMountPoint;
}
/**