mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re-use rescursive copy from common storage

This commit is contained in:
Robin Appelman 2013-07-10 21:39:58 +02:00
parent 488fc402e4
commit 8187164fe1
1 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/private/files/storage/local.php
View File

@ -188,22 +188,7 @@ if (\OC_Util::runningOnWindows()) {
public function copy($path1, $path2) { public function copy($path1, $path2) {
if ($this->is_dir($path1)) { if ($this->is_dir($path1)) {
if ($this->is_dir($path2)) { return parent::copy($path1, $path2);
$this->rmdir($path2);
} else if ($this->is_file($path2)) {
$this->unlink($path2);
}
$dir = $this->opendir($path1);
$this->mkdir($path2);
while ($file = readdir($dir)) {
if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
if (!$this->copy($path1 . '/' . $file, $path2 . '/' . $file)) {
return false;
}
}
}
closedir($dir);
return true;
} else { } else {
return copy($this->datadir . $path1, $this->datadir . $path2); return copy($this->datadir . $path1, $this->datadir . $path2);
} }