From 53a888cc8130a81961dece245b35a226be4d67ab Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 17 Aug 2012 01:22:26 +0200
Subject: more path normalization

---
 lib/files.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'lib/files.php')

diff --git a/lib/files.php b/lib/files.php
index d5bebb7e549..b9c2ead9443 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -33,6 +33,10 @@ class OC_Files {
 	* @param dir $directory path under datadirectory
 	*/
 	public static function getDirectoryContent($directory, $mimetype_filter = ''){
+		$directory=OC_Filesystem::normalizePath($directory);
+		if($directory=='/'){
+			$directory='';
+		}
 		$files=OC_FileCache::getFolderContent($directory, false, $mimetype_filter);
 		foreach($files as &$file){
 			$file['directory']=$directory;
-- 
cgit v1.2.3