upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-09 08:44:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Fix copy overwrite for amazon s3

Browse source
This commit is contained in:
Robin Appelman 2014-08-01 15:05:43 +02:00
parent 3b08b3fad4
commit 11ac9ce28b
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
apps/files_external/lib/amazons3.php
View file

@ -473,8 +473,10 @@ class AmazonS3 extends \OC\Files\Storage\Common {
return false;
}
} else {
if ($this->file_exists($path2)) {
return false;
if ($this->is_dir($path2)) {
$this->rmdir($path2);
} else if ($this->file_exists($path2)) {
$this->unlink($path2);
}
try {
@ -511,11 +513,6 @@ class AmazonS3 extends \OC\Files\Storage\Common {
$path2 = $this->normalizePath($path2);
if ($this->is_file($path1)) {
if ($this->is_dir($path2)) {
$this->rmdir($path2);
} else if ($this->file_exists($path2)) {
$this->unlink($path2);
}
if ($this->copy($path1, $path2) === false) {
return false;
@ -526,11 +523,6 @@ class AmazonS3 extends \OC\Files\Storage\Common {
return false;
}
} else {
if ($this->is_dir($path2)) {
$this->rmdir($path2);
} else if ($this->file_exists($path2)) {
$this->unlink($path2);
}
if ($this->copy($path1, $path2) === false) {
return false;