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

remove unneeded delTree

Browse source
This commit is contained in:
Robin Appelman 2013-07-01 17:41:49 +02:00
parent c99e254178
commit e83b41493f
1 changed files with 1 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -164,7 +164,7 @@ if (\OC_Util::runningOnWindows()) {
}
public function unlink($path) {
return $this->delTree($path);
return unlink($this->datadir . $path);
}
public function rename($path1, $path2) {
@ -212,30 +212,6 @@ if (\OC_Util::runningOnWindows()) {
return $return;
}
/**
* @param string $dir
*/
private function delTree($dir) {
$dirRelative = $dir;
$dir = $this->datadir . $dir;
if (!file_exists($dir)) return true;
if (!is_dir($dir) || is_link($dir)) return unlink($dir);
foreach (scandir($dir) as $item) {
if ($item == '.' || $item == '..') continue;
if (is_file($dir . '/' . $item)) {
if (unlink($dir . '/' . $item)) {
}
} elseif (is_dir($dir . '/' . $item)) {
if (!$this->delTree($dirRelative . "/" . $item)) {
return false;
};
}
}
if ($return = rmdir($dir)) {
}
return $return;
}
/**
* @param string $fullPath
*/