summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2013-11-20 18:59:02 +0100
committerVincent Petry <pvince81@owncloud.com>2013-11-20 18:59:02 +0100
commite26500045fd9f0f102398fabd5e44497618f8b03 (patch)
tree150555390dcf6b7a969dca956e46b134982eb08c
parent5de5c317c1976a5b4fe5139f15cc875a72b1e5d7 (diff)
downloadnextcloud-server-e26500045fd9f0f102398fabd5e44497618f8b03.tar.gz
nextcloud-server-e26500045fd9f0f102398fabd5e44497618f8b03.zip
Fixed move operation to pass the whole URL as expected
The MOVE and COPY spec expect the "Destination" header to receive the full URL, not only the root. Fixes #5942
-rw-r--r--apps/files_external/lib/webdav.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php
index 66920fc9f64..9ee7f555285 100644
--- a/apps/files_external/lib/webdav.php
+++ b/apps/files_external/lib/webdav.php
@@ -268,7 +268,7 @@ class DAV extends \OC\Files\Storage\Common{
public function rename($path1, $path2) {
$this->init();
$path1=$this->cleanPath($path1);
- $path2=$this->root.$this->cleanPath($path2);
+ $path2=$this->createBaseUri().$this->cleanPath($path2);
try {
$this->client->request('MOVE', $path1, null, array('Destination'=>$path2));
return true;
@@ -280,7 +280,7 @@ class DAV extends \OC\Files\Storage\Common{
public function copy($path1, $path2) {
$this->init();
$path1=$this->cleanPath($path1);
- $path2=$this->root.$this->cleanPath($path2);
+ $path2=$this->createBaseUri().$this->cleanPath($path2);
try {
$this->client->request('COPY', $path1, null, array('Destination'=>$path2));
return true;