[Pkg-owncloud-commits] [owncloud] 41/59: Revert "Fix renaming files in the root folder of a MappedLocal storage"

[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 8af6b723bfa821ae562147b1450e00acc02c0489
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Thu Jul 17 09:56:52 2014 +0200

    Revert "Fix renaming files in the root folder of a MappedLocal storage"
    
    This reverts commit 0895324553167ebf4bc87ef83c86285edd8047cb.
---
 lib/private/files/storage/mappedlocal.php | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/lib/private/files/storage/mappedlocal.php b/lib/private/files/storage/mappedlocal.php
index c4a8dc1..6910eef 100644
--- a/lib/private/files/storage/mappedlocal.php
+++ b/lib/private/files/storage/mappedlocal.php
@@ -184,8 +184,8 @@ class MappedLocal extends \OC\Files\Storage\Common {
 	}
 
 	public function rename($path1, $path2) {
-		$srcParent = $this->dirname($path1);
-		$dstParent = $this->dirname($path2);
+		$srcParent = dirname($path1);
+		$dstParent = dirname($path2);
 
 		if (!$this->isUpdatable($srcParent)) {
 			\OC_Log::write('core', 'unable to rename, source directory is not writable : ' . $srcParent, \OC_Log::ERROR);
@@ -355,8 +355,6 @@ class MappedLocal extends \OC\Files\Storage\Common {
 
 	/**
 	 * @param string $path
-	 * @param bool $create
-	 * @return string
 	 */
 	private function buildPath($path, $create = true) {
 		$path = $this->stripLeading($path);
@@ -366,19 +364,6 @@ class MappedLocal extends \OC\Files\Storage\Common {
 
 	/**
 	 * @param string $path
-	 * @return string
-	 */
-	private function dirName($path) {
-		$path = dirname($path);
-		if ($path === '.') {
-			return '';
-		} else {
-			return $path;
-		}
-	}
-
-	/**
-	 * @param string $path
 	 */
 	private function cleanMapper($path, $isLogicPath = true, $recursive=true) {
 		$fullPath = $path;

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