aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2014-04-16 16:41:23 +0200
committerBjoern Schiessle <schiessle@owncloud.com>2014-04-23 12:54:26 +0200
commit93469ca46865d02d33710a2f70f7f6092c8f5c58 (patch)
tree307247653ef5b55f95a00108377f037de6f02a31 /lib
parentdd1e47b3b896e2ee59faf5f423bb911c5d2c2548 (diff)
downloadnextcloud-server-93469ca46865d02d33710a2f70f7f6092c8f5c58.tar.gz
nextcloud-server-93469ca46865d02d33710a2f70f7f6092c8f5c58.zip
make it possible to move files out of a shared mount point
Diffstat (limited to 'lib')
-rw-r--r--lib/private/files/view.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/private/files/view.php b/lib/private/files/view.php
index a61d58aaf24..58dfc73dcf3 100644
--- a/lib/private/files/view.php
+++ b/lib/private/files/view.php
@@ -410,16 +410,16 @@ class View {
// if source and target are on the same storage we can call the rename operation from the
// storage. If it is a "Shared" file/folder we call always the rename operation of the
// shared storage to handle mount point renaming, etc correctly
- if ($mp1 == $mp2) {
+ if ($storage1 instanceof \OC\Files\Storage\Shared) {
if ($storage1) {
- $result = $storage1->rename($internalPath1, $internalPath2);
+ $result = $storage1->rename($absolutePath1, $absolutePath2);
\OC_FileProxy::runPostProxies('rename', $absolutePath1, $absolutePath2);
} else {
$result = false;
}
- } elseif ($storage1 instanceof \OC\Files\Storage\Shared) {
+ } elseif ($mp1 == $mp2) {
if ($storage1) {
- $result = $storage1->rename($absolutePath1, $absolutePath2);
+ $result = $storage1->rename($internalPath1, $internalPath2);
\OC_FileProxy::runPostProxies('rename', $absolutePath1, $absolutePath2);
} else {
$result = false;