From e83b41493fe28eca612f3993a5a1cc3e44e9c145 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 1 Jul 2013 17:41:49 +0200
Subject: [PATCH] remove unneeded delTree
---
lib/private/files/storage/local.php | 26 +-------------------------
1 file changed, 1 insertion(+), 25 deletions(-)
diff --git a/lib/private/files/storage/local.php b/lib/private/files/storage/local.php
index de940fc7cd..aaa9f3c858 100644
--- a/lib/private/files/storage/local.php
+++ b/lib/private/files/storage/local.php
@@ -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
*/
--
GitLab