diff options
author | Joas Schilling <nickvergessen@gmx.de> | 2014-08-11 16:50:52 +0200 |
---|---|---|
committer | Joas Schilling <nickvergessen@gmx.de> | 2014-08-11 16:50:52 +0200 |
commit | d7666d9d3d1e5ba2074a85cf49543ea0a1938f57 (patch) | |
tree | 5ef0cfbeebdc79f1c73dfc2a1a7821b39a86581a /lib | |
parent | e9cdd68412587cc876c96b859c30b605d24e1b9f (diff) | |
download | nextcloud-server-d7666d9d3d1e5ba2074a85cf49543ea0a1938f57.tar.gz nextcloud-server-d7666d9d3d1e5ba2074a85cf49543ea0a1938f57.zip |
Remove doubled slash between folder and path
Diffstat (limited to 'lib')
-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)); /** |