diff options
| author | Robin Appelman <icewind@owncloud.com> | 2015-02-09 15:15:03 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2015-04-13 15:13:03 +0200 |
| commit | d26c6cab90b15bcf9cbd0d95015d8ad2405f7914 (patch) | |
| tree | 34c7a684431c8e9d21d67e7754ce145e445d537e /lib | |
| parent | c4ec8fbeff926e459317829695af1354b4c8ad61 (diff) | |
| download | nextcloud-server-d26c6cab90b15bcf9cbd0d95015d8ad2405f7914.tar.gz nextcloud-server-d26c6cab90b15bcf9cbd0d95015d8ad2405f7914.zip | |
properly return false if we cant delete the source file
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/files/storage/common.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/files/storage/common.php b/lib/private/files/storage/common.php index 164225de3e8..ca898bcc0b3 100644 --- a/lib/private/files/storage/common.php +++ b/lib/private/files/storage/common.php @@ -566,9 +566,9 @@ abstract class Common implements Storage { $result = $this->copyFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath, true); if ($result) { if ($sourceStorage->is_dir($sourceInternalPath)) { - $sourceStorage->rmdir($sourceInternalPath); + $result &= $sourceStorage->rmdir($sourceInternalPath); } else { - $sourceStorage->unlink($sourceInternalPath); + $result &= $sourceStorage->unlink($sourceInternalPath); } } return $result; |