sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix undefined variable for copying empty folders

remotes/origin/stable6
Michael Gapczynski 2013-05-19 15:04:41 +07:00
parent e9b71eed69
commit fc5bce1f76
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/files/view.php
Unescape Escape View File

@ -467,7 +467,7 @@ class View {
}
} else {
if ($this->is_dir($path1) && ($dh = $this->opendir($path1))) {
$this->mkdir($path2);
$result = $this->mkdir($path2);
while ($file = readdir($dh)) {
if (!Filesystem::isIgnoredDir($file)) {
$result = $this->copy($path1 . '/' . $file, $path2 . '/' . $file);

3
tests/lib/files/view.php
Unescape Escape View File

@ -235,9 +235,12 @@ class View extends \PHPUnit_Framework_TestCase {
\OC\Files\Filesystem::mount($storage2, array(), '/substorage');
$rootView = new \OC\Files\View('');
$rootView->mkdir('substorage/emptyfolder');
$rootView->copy('substorage', 'anotherfolder');
$this->assertTrue($rootView->is_dir('/anotherfolder'));
$this->assertTrue($rootView->is_dir('/substorage'));
$this->assertTrue($rootView->is_dir('/anotherfolder/emptyfolder'));
$this->assertTrue($rootView->is_dir('/substorage/emptyfolder'));
$this->assertTrue($rootView->file_exists('/anotherfolder/foo.txt'));
$this->assertTrue($rootView->file_exists('/anotherfolder/foo.png'));
$this->assertTrue($rootView->file_exists('/anotherfolder/folder/bar.txt'));