From e63e246c4894aa7f72feb550d98747890838af0b Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 26 Oct 2012 12:37:49 +0200
Subject: [PATCH] fix problem with normalizePath when there was a double
leading slash
---
lib/files/filesystem.php | 8 ++++----
tests/lib/files/view.php | 3 +++
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index d735cf8626..2b51131b20 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -595,14 +595,14 @@ class Filesystem {
if ($path[0] !== '/') {
$path = '/' . $path;
}
-//remove trailing slash
- if ($stripTrailingSlash and strlen($path) > 1 and substr($path, -1, 1) === '/') {
- $path = substr($path, 0, -1);
- }
//remove duplicate slashes
while (strpos($path, '//') !== false) {
$path = str_replace('//', '/', $path);
}
+//remove trailing slash
+ if ($stripTrailingSlash and strlen($path) > 1 and substr($path, -1, 1) === '/') {
+ $path = substr($path, 0, -1);
+ }
//normalize unicode if possible
if (class_exists('Normalizer')) {
$path = \Normalizer::normalize($path);
diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php
index 6e7608f596..adbed5a18b 100644
--- a/tests/lib/files/view.php
+++ b/tests/lib/files/view.php
@@ -69,6 +69,9 @@ class View extends \PHPUnit_Framework_TestCase {
$this->assertEquals($imageSize, $folderData[1]['size']);
$this->assertEquals($textSize, $folderData[2]['size']);
$this->assertEquals($storageSize, $folderData[3]['size']);
+
+ $folderView = new \OC\Files\View('/folder');
+ $this->assertEquals($rootView->getFileInfo('/folder'), $folderView->getFileInfo('/'));
}
public function testAutoScan() {
--
GitLab