sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9682 from owncloud/mappedlocal-rename 

Fix renaming files in the root folder of a MappedLocal storage
remotes/origin/fix-10825
Vincent Petry 2014-07-17 09:19:17 +07:00
parent b736864e78 5a0397eb5e
commit 77d6d11b91
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/private/files/storage/mappedlocal.php
Unescape Escape View File

@ -184,8 +184,8 @@ class MappedLocal extends \OC\Files\Storage\Common {
}
public function rename($path1, $path2) {
$srcParent = dirname($path1);
$dstParent = dirname($path2);
$srcParent = $this->dirname($path1);
$dstParent = $this->dirname($path2);
if (!$this->isUpdatable($srcParent)) {
\OC_Log::write('core', 'unable to rename, source directory is not writable : ' . $srcParent, \OC_Log::ERROR);
@ -355,6 +355,8 @@ 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);
@ -362,6 +364,19 @@ class MappedLocal extends \OC\Files\Storage\Common {
return $this->mapper->logicToPhysical($fullPath, $create);
}
/**
* @param string $path
* @return string
*/
private function dirName($path) {
$path = dirname($path);
if ($path === '.') {
return '';
} else {
return $path;
}
}
/**
* @param string $path
*/