diff options
author | Joas Schilling <nickvergessen@gmx.de> | 2014-08-11 16:50:52 +0200 |
---|---|---|
committer | Joas Schilling <nickvergessen@gmx.de> | 2014-08-20 11:18:40 +0200 |
commit | a9ce0edecbcc72bb7aea19a93350ab57ac359cbc (patch) | |
tree | af82a29eb2f760ee4149b0a26b20247204b05f65 | |
parent | dce2e5e3b75f39d52619786b14b3952ff3aad01e (diff) | |
download | nextcloud-server-a9ce0edecbcc72bb7aea19a93350ab57ac359cbc.tar.gz nextcloud-server-a9ce0edecbcc72bb7aea19a93350ab57ac359cbc.zip |
Remove doubled slash between folder and path
-rw-r--r-- | lib/private/files/cache/updater.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/private/files/cache/updater.php b/lib/private/files/cache/updater.php index f15c203cd58..8bfa5fc74ca 100644 --- a/lib/private/files/cache/updater.php +++ b/lib/private/files/cache/updater.php @@ -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)); /** |