[Pkg-owncloud-commits] [owncloud] 107/121: Remove doubled slash between folder and path

[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 a9ce0edecbcc72bb7aea19a93350ab57ac359cbc
Author: Joas Schilling <nickvergessen at gmx.de>
Date:   Mon Aug 11 16:50:52 2014 +0200

    Remove doubled slash between folder and path
---
 lib/private/files/cache/updater.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/private/files/cache/updater.php b/lib/private/files/cache/updater.php
index f15c203..8bfa5fc 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));
 
 			/**

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