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

fix recursive rename for local storage backend

Browse source
This commit is contained in:
Robin Appelman 2013-07-01 17:45:01 +02:00
parent e83b41493f
commit 38c1da0976
2 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/private/files/storage/local.php
View file

@ -177,9 +177,11 @@ if (\OC_Util::runningOnWindows()) {
return false;
}
if ($return = rename($this->datadir . $path1, $this->datadir . $path2)) {
if ($this->is_dir($path2)) {
$this->rmdir($path2);
}
return $return;
return rename($this->datadir . $path1, $this->datadir . $path2);
}
public function copy($path1, $path2) {

16
tests/lib/files/storage/storage.php
View file

@ -385,4 +385,20 @@ abstract class Storage extends \PHPUnit_Framework_TestCase {
$this->assertEquals('qwerty', $this->instance->file_get_contents('target/test2.txt'));
$this->assertEquals('bar', $this->instance->file_get_contents('target/subfolder/test.txt'));
}
public function testRenameOverWriteDirectory() {
$this->instance->mkdir('source');
$this->instance->file_put_contents('source/test1.txt', 'foo');
$this->instance->mkdir('target');
$this->instance->file_put_contents('target/test1.txt', 'bar');
$this->instance->file_put_contents('target/test2.txt', 'bar');
$this->instance->rename('source', 'target');
$this->assertFalse($this->instance->file_exists('source'));
$this->assertFalse($this->instance->file_exists('source/test1.txt'));
$this->assertFalse($this->instance->file_exists('target/test2.txt'));
$this->assertEquals('foo', $this->instance->file_get_contents('target/test1.txt'));
}
}