diff options
| author | Julius Härtl <jus@bitgrid.net> | 2021-01-05 15:49:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-05 15:49:16 +0100 |
| commit | 9b9c1aa7fd643747cd423d40c9c82ffa74e9e452 (patch) | |
| tree | d9161c2b2f176de5125efeb4a74a6ee4f3378754 /lib | |
| parent | 50b380e85b46f37de3612e4aa077726e8da94d01 (diff) | |
| parent | 98560c80ea18df3629f374caa036221dadcb25f2 (diff) | |
| download | nextcloud-server-9b9c1aa7fd643747cd423d40c9c82ffa74e9e452.tar.gz nextcloud-server-9b9c1aa7fd643747cd423d40c9c82ffa74e9e452.zip | |
Merge pull request #24961 from nextcloud/bugfix/noid/copy-tests
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 bddb1f4a294..aa2aeee403b 100644 --- a/lib/private/Files/Storage/Common.php +++ b/lib/private/Files/Storage/Common.php @@ -689,9 +689,9 @@ abstract class Common implements Storage, ILockingStorage, IWriteStreamStorage { $result = $this->copyFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath, true); if ($result) { if ($sourceStorage->is_dir($sourceInternalPath)) { - $result &= $sourceStorage->rmdir($sourceInternalPath); + $result = $result && $sourceStorage->rmdir($sourceInternalPath); } else { - $result &= $sourceStorage->unlink($sourceInternalPath); + $result = $result && $sourceStorage->unlink($sourceInternalPath); } } return $result; |