wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

properly return false if we cant delete the source file

Browse source
This commit is contained in:
Robin Appelman 2015-02-09 15:15:03 +01:00
parent c4ec8fbeff
commit d26c6cab90
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/files_trashbin/tests/storage.php
View file

@ -202,12 +202,13 @@ class Storage extends \Test\TestCase {
$cache = $storage->getCache();
Filesystem::mount($storage, [], '/' . $this->user . '/files');
Filesystem::mount($storage, [], '/' . $this->user);
$storage->mkdir('files');
$this->userView->file_put_contents('test.txt', 'foo');
$this->assertTrue($storage->file_exists('test.txt'));
$this->assertTrue($storage->file_exists('files/test.txt'));
$this->assertFalse($this->userView->unlink('test.txt'));
$this->assertTrue($storage->file_exists('test.txt'));
$this->assertTrue($cache->inCache('test.txt'));
$this->assertTrue($storage->file_exists('files/test.txt'));
$this->assertTrue($cache->inCache('files/test.txt'));
// file should not be in the trashbin
$results = $this->rootView->getDirectoryContent($this->user . '/files_trashbin/files/');

4
lib/private/files/storage/common.php
View file

@ -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;