fix(storage): Try to delete existing target

Signed-off-by: Git'Fellow <[email protected]> Add same logic to common storage [skip ci]
nextcloud · Nov 20, 2024 · 5b09c92 · 5b09c92
1 parent b2464dc
commit 5b09c92
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/lib/private/Files/Storage/Common.php b/lib/private/Files/Storage/Common.php
@@ -113,6 +113,7 @@ protected function remove($path) {
 		} else {
 			return false;
 		}
+		return false;
 	}
 
 	public function is_dir($path) {

diff --git a/lib/private/Files/Storage/Local.php b/lib/private/Files/Storage/Local.php
@@ -380,10 +380,12 @@ public function rename($source, $target): bool {
 			return false;
 		}
 
-		if ($this->is_dir($target)) {
-			$this->rmdir($target);
-		} elseif ($this->is_file($target)) {
-			$this->unlink($target);
+		if ($this->file_exists($target)) {
+			if ($this->is_dir($target)) {
+				$this->rmdir($target);
+			} elseif ($this->is_file($target)) {
+				$this->unlink($target);
+			}
 		}
 
 		if ($this->is_dir($source)) {