Remove doubled slash between folder and path

This commit is contained in:
Joas Schilling 2014-08-11 16:50:52 +02:00
parent e9cdd68412
commit d7666d9d3d
1 changed files with 4 additions and 5 deletions

View File

@ -114,7 +114,7 @@ class Updater {
/**
* get file owner and path
* @param string $filename
* @return string[] with the oweners uid and the owners path
* @return string[] with the owner's uid and the owner's path
*/
private static function getUidAndFilename($filename) {
@ -124,12 +124,12 @@ class Updater {
if ($uid != \OCP\User::getUser()) {
$info = \OC\Files\Filesystem::getFileInfo($filename);
if (!$info) {
return array($uid, '/files/' . $filename);
return array($uid, '/files' . $filename);
}
$ownerView = new \OC\Files\View('/' . $uid . '/files');
$filename = $ownerView->getPath($info['fileid']);
}
return array($uid, '/files/' . $filename);
return array($uid, '/files' . $filename);
}
/**
@ -139,8 +139,7 @@ class Updater {
* @param string $time
*/
static public function correctFolder($path, $time) {
if ($path !== '' && $path !== '/') {
if ($path !== '' && $path !== '/' && $path !== '\\') {
list($owner, $realPath) = self::getUidAndFilename(dirname($path));
/**