upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

fix(storage): fallback to copy and unlink when rename fails

Browse source 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
This commit is contained in:
Daniel Kesselberg 2023-06-02 22:26:20 +02:00 committed by Daniel
parent 286cceebc3
commit b4ff557b8c
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/private/Files/Storage/Local.php
View file

@ -335,7 +335,7 @@ class Local extends \OC\Files\Storage\Common {
}
}
public function rename($source, $target) {
public function rename($source, $target): bool {
$srcParent = dirname($source);
$dstParent = dirname($target);
@ -361,21 +361,14 @@ class Local extends \OC\Files\Storage\Common {
}
if ($this->is_dir($source)) {
// we can't move folders across devices, use copy instead
$stat1 = stat(dirname($this->getSourcePath($source)));
$stat2 = stat(dirname($this->getSourcePath($target)));
if ($stat1['dev'] !== $stat2['dev']) {
$result = $this->copy($source, $target);
if ($result) {
$result &= $this->rmdir($source);
}
return $result;
}
$this->checkTreeForForbiddenItems($this->getSourcePath($source));
}
return rename($this->getSourcePath($source), $this->getSourcePath($target));
if (@rename($this->getSourcePath($source), $this->getSourcePath($target))) {
return true;
}
return $this->copy($source, $target) && $this->rmdir($source);
}
public function copy($source, $target) {