mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #12090 from AdamWill/google-rename-delete 

google: delete original after successful rename
This commit is contained in:
Morris Jobke 2014-12-10 09:10:17 +01:00
parent 3026cdbc80 415411a3d5
commit e3de51078d
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/files_external/lib/google.php
View File

@ -370,10 +370,22 @@ class Google extends \OC\Files\Storage\Common {
return false; return false;
} }
} }
// We need to get the object for the existing file with the same
// name (if there is one) before we do the patch. If oldfile
// exists and is a directory we have to delete it before we
// do the rename too.
$oldfile = $this->getDriveFile($path2);
if ($oldfile && $this->is_dir($path2)) {
$this->rmdir($path2);
$oldfile = false;
}
$result = $this->service->files->patch($file->getId(), $file); $result = $this->service->files->patch($file->getId(), $file);
if ($result) { if ($result) {
$this->setDriveFile($path1, false); $this->setDriveFile($path1, false);
$this->setDriveFile($path2, $result); $this->setDriveFile($path2, $result);
if ($oldfile) {
$this->service->files->delete($oldfile->getId());
}
} }
return (bool)$result; return (bool)$result;
} else { } else {