[Pkg-owncloud-commits] [owncloud] 101/199: Fix LocalStorage->unlink to work on folder as expected

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit af35b6ad9db6490f5bfd25143d214f5b1d8dfd34
Author: Robin Appelman <icewind at owncloud.com>
Date:   Tue May 6 15:54:48 2014 +0200

    Fix LocalStorage->unlink to work on folder as expected
---
 lib/private/files/storage/local.php | 9 ++++++++-
 lib/private/files/view.php          | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/private/files/storage/local.php b/lib/private/files/storage/local.php
index 43ffeaf..943c416 100644
--- a/lib/private/files/storage/local.php
+++ b/lib/private/files/storage/local.php
@@ -164,7 +164,14 @@ if (\OC_Util::runningOnWindows()) {
 		}
 
 		public function unlink($path) {
-			return unlink($this->datadir . $path);
+			if ($this->is_dir($path)) {
+				return $this->rmdir($path);
+			} else if ($this->is_file($path)) {
+				return unlink($this->datadir . $path);
+			} else {
+				return false;
+			}
+
 		}
 
 		public function rename($path1, $path2) {
diff --git a/lib/private/files/view.php b/lib/private/files/view.php
index 940f31f..0743d5c 100644
--- a/lib/private/files/view.php
+++ b/lib/private/files/view.php
@@ -432,7 +432,7 @@ class View {
 					if ($this->is_dir($path1)) {
 						$result = $this->copy($path1, $path2);
 						if ($result === true) {
-							$result = $storage1->unlink($internalPath1);
+							$result = $storage1->rmdir($internalPath1);
 						}
 					} else {
 						$source = $this->fopen($path1 . $postFix1, 'r');

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git